diff --git a/.gitignore b/.gitignore index 54c77670..dc897344 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # # .gitignore -# Libresonic/libresonic +# airsonic/airsonic # # Project-wide gitignores # diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d1634fe..6eb526a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ v6.2 @@ -62,7 +62,7 @@ v6.1.beta1 v6.1-alpha1 ----------- - * Search+replace subsonic-->libresonic + * Search+replace subsonic-->airsonic * Move out of org.sourceforge.subsonic namespace * Develop becomes horribly unstable, you shouldn't be using this. @@ -76,5 +76,5 @@ v6.0.1 v6.0 ---- - * First release as Libresonic + * First release as Airsonic * Based upon Subsonic 5.3(stable) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bb0898f0..f98391d6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,10 +1,10 @@ Guidelines for Contributing --------------------------- -Libresonic development is a community project, and contributions are welcomed. Here are a few guidelines you should follow before submitting: +Airsonic development is a community project, and contributions are welcomed. Here are a few guidelines you should follow before submitting: - 1. **License Acceptance** All contributions must be licensed as [GNU GPLv3](https://github.com/Libresonic/libresonic/blob/develop/LICENSE.txt) to be accepted. Use [`git commit --signoff`](https://jk.gs/git-commit.html) to acknowledge this. + 1. **License Acceptance** All contributions must be licensed as [GNU GPLv3](https://github.com/airsonic/airsonic/blob/develop/LICENSE.txt) to be accepted. Use [`git commit --signoff`](https://jk.gs/git-commit.html) to acknowledge this. 2. **No Breakage** New features or changes to existing ones must not degrade the user experience. This means do not introduce bugs, remove functionality, or make large changes to existing themes/UI without prior discussion in an Issue. 3. **Coding standards** Language best-practices should be followed, comment generously, and avoid "clever" algorithms. Refactoring existing messes is great, but watch out for breakage. - 4. **Be bold!** Without contributions, this project will vanish. If you just want to help out, try [submiting a patch](https://github.com/Libresonic/libresonic/issues?q=is%3Aissue+is%3Aopen+label%3Apatches-welcome) for an open Issue. - 5. **Stay relevant** Issues or commentary that is off-topic or tangential to Libresonic development is subject to moderation. Questions should be focused on improving documentation to solve a problem. Visit [Reddit](https://www.reddit.com/r/libresonic) or [IRC](http://webchat.freenode.net?channels=%23libresonic) for community discussion. + 4. **Be bold!** Without contributions, this project will vanish. If you just want to help out, try [submiting a patch](https://github.com/airsonic/airsonic/issues?q=is%3Aissue+is%3Aopen+label%3Apatches-welcome) for an open Issue. + 5. **Stay relevant** Issues or commentary that is off-topic or tangential to Airsonic development is subject to moderation. Questions should be focused on improving documentation to solve a problem. Visit [Reddit](https://www.reddit.com/r/airsonic) or [IRC](http://webchat.freenode.net?channels=%23airsonic) for community discussion. diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index fb075d19..a95a231c 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -1,10 +1,10 @@ Documentation ============= -Documentation is stored in a [dedicated repository](https://github.com/Libresonic/documentation). +Documentation is stored in a [dedicated repository](https://github.com/Airsonic/documentation). diff --git a/README.md b/README.md index 07711b8a..0f8ed3b0 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,22 @@ -Libresonic +Airsonic ======== -What is Libresonic? +What is Airsonic? ----------------- -Libresonic is a free, web-based media streamer, providing ubiquitious access to your music. Use it to share your music with friends, or to listen to your own music while at work. You can stream to multiple players simultaneously, for instance to one player in your kitchen and another in your living room. +Airsonic is a free, web-based media streamer, providing ubiquitious access to your music. Use it to share your music with friends, or to listen to your own music while at work. You can stream to multiple players simultaneously, for instance to one player in your kitchen and another in your living room. -Libresonic is designed to handle very large music collections (hundreds of gigabytes). Although optimized for MP3 streaming, it works for any audio or video format that can stream over HTTP, for instance AAC and OGG. By using transcoder plug-ins, Libresonic supports on-the-fly conversion and streaming of virtually any audio format, including WMA, FLAC, APE, Musepack, WavPack and Shorten. +Airsonic is designed to handle very large music collections (hundreds of gigabytes). Although optimized for MP3 streaming, it works for any audio or video format that can stream over HTTP, for instance AAC and OGG. By using transcoder plug-ins, Airsonic supports on-the-fly conversion and streaming of virtually any audio format, including WMA, FLAC, APE, Musepack, WavPack and Shorten. -If you have constrained bandwidth, you may set an upper limit for the bitrate of the music streams. Libresonic will then automatically resample the music to a suitable bitrate. +If you have constrained bandwidth, you may set an upper limit for the bitrate of the music streams. Airsonic will then automatically resample the music to a suitable bitrate. -In addition to being a streaming media server, Libresonic works very well as a local jukebox. The intuitive web interface, as well as search and index facilities, are optimized for efficient browsing through large media libraries. Libresonic also comes with an integrated Podcast receiver, with many of the same features as you find in iTunes. +In addition to being a streaming media server, Airsonic works very well as a local jukebox. The intuitive web interface, as well as search and index facilities, are optimized for efficient browsing through large media libraries. Airsonic also comes with an integrated Podcast receiver, with many of the same features as you find in iTunes. -Based on Java technology, Libresonic runs on most platforms, including Windows, Mac, Linux and Unix variants. +Based on Java technology, Airsonic runs on most platforms, including Windows, Mac, Linux and Unix variants. ![Screenshot](contrib/assets/screenshot.jpg) @@ -25,31 +25,31 @@ History The original [Subsonic](http://www.subsonic.org/) is developed by [Sindre Mehus](mailto:sindre@activeobjects.no). Subsonic was open source through version 6.0-beta1, and closed-source from then onwards. -Libresonic is maintained by [Eugene E. Kashpureff Jr](mailto:eugene@kashpureff.org). It originated as an unofficial("Kang") of Subsonic which did not contain the Licensing code checks present in the official builds. With the announcement of Subsonic's closed-source future, a decision was made to make a full fork and rebrand to Libresonic. +Airsonic is maintained by [Eugene E. Kashpureff Jr](mailto:eugene@kashpureff.org). It originated as an unofficial("Kang") of Subsonic which did not contain the Licensing code checks present in the official builds. With the announcement of Subsonic's closed-source future, a decision was made to make a full fork and rebrand to Airsonic. -Libresonic will strive to maintain compatibility and stability for Subsonic users, including a clean upgrade path. New features and refactoring are welcomed as a Pull Request on GitHub. +Airsonic will strive to maintain compatibility and stability for Subsonic users, including a clean upgrade path. New features and refactoring are welcomed as a Pull Request on GitHub. License ------- -Libresonic is free software and licensed under the [GNU General Public License version 3](http://www.gnu.org/copyleft/gpl.html). The code in this repository (and associated binaries) are free of any "license key" or other restrictions. If you wish to thank the maintainer of this repository, please consider a donation to the [Electronic Frontier Foundation](https://supporters.eff.org/donate). +Airsonic is free software and licensed under the [GNU General Public License version 3](http://www.gnu.org/copyleft/gpl.html). The code in this repository (and associated binaries) are free of any "license key" or other restrictions. If you wish to thank the maintainer of this repository, please consider a donation to the [Electronic Frontier Foundation](https://supporters.eff.org/donate). -The [Subsonic source code](https://github.com/Libresonic/subsonic-svn) was released under the GPLv3 through version 6.0-beta1. Beginning with 6.0-beta2, source is no longer provided. Binaries of Subsonic are only available under a commercial license. There is a [Subsonic Premium](http://www.subsonic.org/pages/premium.jsp) service which adds functionality not available in Libresonic. Subsonic also offers RPM, Deb, Exe, and other pre-built packages that Libresonic [currently does not](https://github.com/Libresonic/libresonic/issues/65). +The [Subsonic source code](https://github.com/airsonic/subsonic-svn) was released under the GPLv3 through version 6.0-beta1. Beginning with 6.0-beta2, source is no longer provided. Binaries of Subsonic are only available under a commercial license. There is a [Subsonic Premium](http://www.subsonic.org/pages/premium.jsp) service which adds functionality not available in Airsonic. Subsonic also offers RPM, Deb, Exe, and other pre-built packages that Airsonic [currently does not](https://github.com/airsonic/airsonic/issues/65). Usage ----- -Libresonic can be downloaded from -[GitHub](https://github.com/Libresonic/libresonic/releases) for personal usage. -Packagers can also reference the [release repository](https://libresonic.org/release/). +Airsonic can be downloaded from +[GitHub](https://github.com/airsonic/airsonic/releases) for personal usage. +Packagers can also reference the [release repository](https://airsonic.org/release/). -Please use the [Libresonic documentation](https://libresonic.github.io/docs/) for instructions on running Libresonic. +Please use the [Airsonic documentation](https://airsonic.github.io/docs/) for instructions on running Airsonic. Community --------- -Please see [Reddit](https://www.reddit.com/r/libresonic) or -[IRC](http://webchat.freenode.net?channels=%23libresonic) for community +Please see [Reddit](https://www.reddit.com/r/airsonic) or +[IRC](http://webchat.freenode.net?channels=%23airsonic) for community discussion. diff --git a/airsonic-main/Getting Started.html b/airsonic-main/Getting Started.html index b0c9f829..3a0292f0 100644 --- a/airsonic-main/Getting Started.html +++ b/airsonic-main/Getting Started.html @@ -1,7 +1,7 @@ - + diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml index ddc292fc..7a6aabe9 100644 --- a/airsonic-main/pom.xml +++ b/airsonic-main/pom.xml @@ -2,13 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - libresonic-main + airsonic-main war - Libresonic Main + Airsonic Main - org.libresonic.player - libresonic + org.airsonic.player + airsonic 6.3-SNAPSHOT @@ -20,14 +20,14 @@ - org.libresonic.player + org.airsonic.player subsonic-rest-api ${project.version} - org.libresonic.player - libresonic-sonos-api + org.airsonic.player + airsonic-sonos-api ${project.version} @@ -465,7 +465,7 @@ - libresonic + airsonic org.apache.maven.plugins @@ -476,7 +476,7 @@ spring-boot-maven-plugin 1.5.2.RELEASE - org.libresonic.player.boot.Application + org.airsonic.player.boot.Application WAR ${boot.group.excludes} ${boot.artifact.excludes} @@ -522,8 +522,8 @@ - + ${buildNumber} ${DSTAMP} ${project.version} diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/ArtistInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/ArtistInfo.java index 52477581..bd7270d6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/ArtistInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/ArtistInfo.java @@ -1,25 +1,25 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2014 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; -import org.libresonic.player.domain.ArtistBio; +import org.airsonic.player.domain.ArtistBio; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtInfo.java index c6ffeb41..b0823e7c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtInfo.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; /** * Contains info about cover art images for an album. diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtService.java index 4b4f3c60..b2476535 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtService.java @@ -1,36 +1,36 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; - +package org.airsonic.player.ajax; + +import org.airsonic.player.domain.LastFmCoverArt; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.LastFmService; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.util.StringUtil; import org.apache.commons.io.IOUtils; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.libresonic.player.domain.LastFmCoverArt; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.LastFmService; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsInfo.java index 96e99ccd..55dab7e9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsInfo.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; /** * Contains lyrics info for a song. diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java index 7cdf608c..153647b4 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java @@ -1,24 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; +import org.airsonic.player.util.StringUtil; import org.apache.commons.lang.StringUtils; import org.apache.http.client.ResponseHandler; import org.apache.http.client.config.RequestConfig; @@ -30,7 +31,6 @@ import org.jdom.Document; import org.jdom.Element; import org.jdom.Namespace; import org.jdom.input.SAXBuilder; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/MultiService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/MultiService.java index 23a5554f..4511be46 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/MultiService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/MultiService.java @@ -1,33 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; - +package org.airsonic.player.ajax; + +import org.airsonic.player.domain.ArtistBio; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.LastFmService; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.directwebremoting.WebContextFactory; -import org.libresonic.player.domain.ArtistBio; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.LastFmService; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingInfo.java index e89501f4..712ded92 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingInfo.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; /** * Details about what a user is currently listening to. diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingService.java index afae1ca1..88bf925d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingService.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; +import org.airsonic.player.util.StringUtil; import org.apache.commons.lang.StringUtils; import org.directwebremoting.WebContext; import org.directwebremoting.WebContextFactory; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.*; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java index 2cd10dde..64f44837 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.util.StringUtil; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java index 168d918c..097a9181 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java @@ -1,33 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; import com.google.common.base.Function; import com.google.common.collect.Lists; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.dao.PlayQueueDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; +import org.airsonic.player.service.PlaylistService; +import org.airsonic.player.util.StringUtil; import org.directwebremoting.WebContextFactory; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.dao.PlayQueueDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.*; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.util.StringUtil; import org.springframework.web.servlet.support.RequestContextUtils; import javax.servlet.http.HttpServletRequest; @@ -54,7 +54,7 @@ public class PlayQueueService { private SearchService searchService; private RatingService ratingService; private PodcastService podcastService; - private org.libresonic.player.service.PlaylistService playlistService; + private PlaylistService playlistService; private MediaFileDao mediaFileDao; private PlayQueueDao playQueueDao; private JWTSecurityService jwtSecurityService; @@ -146,7 +146,7 @@ public class PlayQueueService { List ids = MediaFile.toIdList(playQueue.getFiles()); Integer currentId = currentSongIndex == -1 ? null : playQueue.getFile(currentSongIndex).getId(); - SavedPlayQueue savedPlayQueue = new SavedPlayQueue(null, username, ids, currentId, positionMillis, new Date(), "Libresonic"); + SavedPlayQueue savedPlayQueue = new SavedPlayQueue(null, username, ids, currentId, positionMillis, new Date(), "Airsonic"); playQueueDao.savePlayQueue(savedPlayQueue); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistInfo.java index 7c80f95c..efb1d802 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistInfo.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; -import org.libresonic.player.domain.Playlist; +import org.airsonic.player.domain.Playlist; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistService.java index 4365817c..c7135835 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistService.java @@ -1,35 +1,35 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; - +package org.airsonic.player.ajax; + +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.i18n.LocaleResolver; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.directwebremoting.WebContextFactory; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.i18n.LibresonicLocaleResolver; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,11 +47,11 @@ public class PlaylistService { private MediaFileService mediaFileService; private SecurityService securityService; - private org.libresonic.player.service.PlaylistService playlistService; + private org.airsonic.player.service.PlaylistService playlistService; private MediaFileDao mediaFileDao; private SettingsService settingsService; private PlayerService playerService; - private LibresonicLocaleResolver localeResolver; + private LocaleResolver localeResolver; public List getReadablePlaylists() { HttpServletRequest request = WebContextFactory.get().getHttpServletRequest(); @@ -136,7 +136,7 @@ public class PlaylistService { playlist.setChanged(now); playlist.setShared(false); - ResourceBundle bundle = ResourceBundle.getBundle("org.libresonic.player.i18n.ResourceBundle", locale); + ResourceBundle bundle = ResourceBundle.getBundle("org.airsonic.player.i18n.ResourceBundle", locale); playlist.setName(bundle.getString("top.starred") + " " + dateFormat.format(now)); playlistService.createPlaylist(playlist); @@ -233,7 +233,7 @@ public class PlaylistService { return getPlaylist(id); } - public void setPlaylistService(org.libresonic.player.service.PlaylistService playlistService) { + public void setPlaylistService(org.airsonic.player.service.PlaylistService playlistService) { this.playlistService = playlistService; } @@ -257,7 +257,7 @@ public class PlaylistService { this.playerService = playerService; } - public void setLocaleResolver(LibresonicLocaleResolver localeResolver) { + public void setLocaleResolver(LocaleResolver localeResolver) { this.localeResolver = localeResolver; } } \ No newline at end of file diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/ScanInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/ScanInfo.java index 99afe0f1..04f2b7fc 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/ScanInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/ScanInfo.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; /** * Media folder scanning status. diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/SimilarArtist.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/SimilarArtist.java index 53125fd2..9b2979cc 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/SimilarArtist.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/SimilarArtist.java @@ -1,22 +1,22 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2014 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; /** * Contains info about a similar artist. diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/StarService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/StarService.java index 6bd05a62..5c9e4881 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/StarService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/StarService.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.SecurityService; import org.directwebremoting.WebContext; import org.directwebremoting.WebContextFactory; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.SecurityService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/TagService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/TagService.java index 4ab34831..7edf6f29 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/TagService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/TagService.java @@ -1,32 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.metadata.MetaData; +import org.airsonic.player.service.metadata.MetaDataParser; +import org.airsonic.player.service.metadata.MetaDataParserFactory; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.metadata.MetaData; -import org.libresonic.player.service.metadata.MetaDataParser; -import org.libresonic.player.service.metadata.MetaDataParserFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/TopSong.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/TopSong.java index acced94e..26dcec95 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/TopSong.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/TopSong.java @@ -1,22 +1,22 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; /** * See {@link ArtistInfo}. diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java index 64fa8a88..415f9529 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; +import org.airsonic.player.controller.UploadController; +import org.airsonic.player.domain.TransferStatus; import org.directwebremoting.WebContextFactory; -import org.libresonic.player.controller.UploadController; -import org.libresonic.player.domain.TransferStatus; import javax.servlet.http.HttpSession; diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/UploadInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/UploadInfo.java index 4f1b72fd..e41b3f97 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/UploadInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/UploadInfo.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.ajax; +package org.airsonic.player.ajax; /** * Contains status for a file upload. diff --git a/airsonic-main/src/main/java/org/airsonic/player/boot/Application.java b/airsonic-main/src/main/java/org/airsonic/player/boot/Application.java index 65089750..b9429b6b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/boot/Application.java +++ b/airsonic-main/src/main/java/org/airsonic/player/boot/Application.java @@ -1,9 +1,9 @@ -package org.libresonic.player.boot; +package org.airsonic.player.boot; import net.sf.ehcache.constructs.web.ShutdownListener; +import org.airsonic.player.filter.*; +import org.airsonic.player.spring.CustomPropertySourceConfigurer; import org.directwebremoting.servlet.DwrServlet; -import org.libresonic.player.filter.*; -import org.libresonic.player.spring.LibresonicPropertySourceConfigurer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -40,7 +40,7 @@ import java.lang.reflect.Method; @ImportResource(value = {"classpath:/applicationContext-service.xml", "classpath:/applicationContext-cache.xml", "classpath:/applicationContext-sonos.xml", - "classpath:/libresonic-servlet.xml"}) + "classpath:/servlet.xml"}) public class Application extends SpringBootServletInitializer implements EmbeddedServletContainerCustomizer { private static final Logger LOG = LoggerFactory.getLogger(Application.class); @@ -180,7 +180,7 @@ public class Application extends SpringBootServletInitializer implements Embedde // Customize the application or call application.sources(...) to add sources // Since our example is itself a @Configuration class (via @SpringBootApplication) // we actually don't need to override this method. - return application.sources(Application.class).web(true).initializers(new LibresonicPropertySourceConfigurer()); + return application.sources(Application.class).web(true).initializers(new CustomPropertySourceConfigurer()); } @Override @@ -200,7 +200,7 @@ public class Application extends SpringBootServletInitializer implements Embedde if(tomcatESCF.isInstance(container)) { LOG.debug("Attempting to optimize tomcat"); Object tomcatESCFInstance = tomcatESCF.cast(container); - Class tomcatApplicationClass = Class.forName("org.libresonic.player.boot.TomcatApplication"); + Class tomcatApplicationClass = Class.forName("TomcatApplication"); Method configure = ReflectionUtils.findMethod(tomcatApplicationClass, "configure", tomcatESCF); configure.invoke(null, tomcatESCFInstance); LOG.debug("Tomcat optimizations complete"); diff --git a/airsonic-main/src/main/java/org/airsonic/player/boot/TomcatApplication.java b/airsonic-main/src/main/java/org/airsonic/player/boot/TomcatApplication.java index d8290c8b..8cadde6a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/boot/TomcatApplication.java +++ b/airsonic-main/src/main/java/org/airsonic/player/boot/TomcatApplication.java @@ -1,4 +1,4 @@ -package org.libresonic.player.boot; +package org.airsonic.player.boot; import org.apache.catalina.Container; import org.apache.catalina.Wrapper; @@ -12,7 +12,7 @@ public class TomcatApplication { tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> { - boolean development = (System.getProperty("libresonic.development") != null); + boolean development = (System.getProperty("airsonic.development") != null); // Increase the size and time before eviction of the Tomcat // cache so that resources aren't uncompressed too often. diff --git a/airsonic-main/src/main/java/org/airsonic/player/cache/CacheFactory.java b/airsonic-main/src/main/java/org/airsonic/player/cache/CacheFactory.java index 67d4806f..825a35b7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/cache/CacheFactory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/cache/CacheFactory.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.cache; +package org.airsonic.player.cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Ehcache; import net.sf.ehcache.config.Configuration; import net.sf.ehcache.config.ConfigurationFactory; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -44,8 +44,8 @@ public class CacheFactory implements InitializingBean { public void afterPropertiesSet() throws Exception { Configuration configuration = ConfigurationFactory.parseConfiguration(); - // Override configuration to make sure cache is stored in Libresonic home dir. - File cacheDir = new File(SettingsService.getLibresonicHome(), "cache"); + // Override configuration to make sure cache is stored in Airsonic home dir. + File cacheDir = new File(SettingsService.getAirsonicHome(), "cache"); configuration.getDiskStoreConfiguration().setPath(cacheDir.getPath()); cacheManager = CacheManager.create(configuration); diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/AdvancedSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/AdvancedSettingsCommand.java index 2f8168e6..71e44cc4 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/AdvancedSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/AdvancedSettingsCommand.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.AdvancedSettingsController; +import org.airsonic.player.controller.AdvancedSettingsController; /** * Command used in {@link AdvancedSettingsController}. diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/DatabaseSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/DatabaseSettingsCommand.java index 769f0d8e..968e38f3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/DatabaseSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/DatabaseSettingsCommand.java @@ -1,6 +1,6 @@ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.spring.DataSourceConfigType; +import org.airsonic.player.spring.DataSourceConfigType; import javax.validation.constraints.NotNull; diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/EnumHolder.java b/airsonic-main/src/main/java/org/airsonic/player/command/EnumHolder.java index 7a25abaa..83997aa8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/EnumHolder.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/EnumHolder.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; /** * Holds the name and description of an enum value. diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/GeneralSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/GeneralSettingsCommand.java index c8fad18a..5e8269d6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/GeneralSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/GeneralSettingsCommand.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.GeneralSettingsController; -import org.libresonic.player.domain.Theme; +import org.airsonic.player.controller.GeneralSettingsController; +import org.airsonic.player.domain.Theme; /** * Command used in {@link GeneralSettingsController}. diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/MusicFolderSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/MusicFolderSettingsCommand.java index 2bec6950..2e233ce1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/MusicFolderSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/MusicFolderSettingsCommand.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; +import org.airsonic.player.controller.MusicFolderSettingsController; +import org.airsonic.player.domain.MusicFolder; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.controller.MusicFolderSettingsController; -import org.libresonic.player.domain.MusicFolder; import java.io.File; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/PasswordSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PasswordSettingsCommand.java index d102329d..2d0f6d4b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/PasswordSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/PasswordSettingsCommand.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.PasswordSettingsController; +import org.airsonic.player.controller.PasswordSettingsController; /** * Command used in {@link PasswordSettingsController}. diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/PersonalSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PersonalSettingsCommand.java index 73b00b2f..86bd68f0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/PersonalSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/PersonalSettingsCommand.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.PersonalSettingsController; -import org.libresonic.player.domain.*; +import org.airsonic.player.controller.PersonalSettingsController; +import org.airsonic.player.domain.*; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/PlayerSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PlayerSettingsCommand.java index cb5dcd4a..d4834a6d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/PlayerSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/PlayerSettingsCommand.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.PlayerSettingsController; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.PlayerTechnology; -import org.libresonic.player.domain.TranscodeScheme; -import org.libresonic.player.domain.Transcoding; +import org.airsonic.player.controller.PlayerSettingsController; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.PlayerTechnology; +import org.airsonic.player.domain.TranscodeScheme; +import org.airsonic.player.domain.Transcoding; import java.util.Date; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/PodcastSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PodcastSettingsCommand.java index 84ec7dfb..5af4d5af 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/PodcastSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/PodcastSettingsCommand.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.PodcastSettingsController; +import org.airsonic.player.controller.PodcastSettingsController; /** * Command used in {@link PodcastSettingsController}. diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/SearchCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/SearchCommand.java index 0df9f030..09247b15 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/SearchCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/SearchCommand.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.SearchController; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.User; +import org.airsonic.player.controller.SearchController; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.User; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/command/UserSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/UserSettingsCommand.java index a6d12a59..07e6a1a9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/command/UserSettingsCommand.java +++ b/airsonic-main/src/main/java/org/airsonic/player/command/UserSettingsCommand.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.command; +package org.airsonic.player.command; -import org.libresonic.player.controller.UserSettingsController; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.TranscodeScheme; -import org.libresonic.player.domain.User; +import org.airsonic.player.controller.UserSettingsController; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.TranscodeScheme; +import org.airsonic.player.domain.User; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AbstractChartController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AbstractChartController.java index fe27ddf3..26bec6ff 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AbstractChartController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AbstractChartController.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.springframework.ui.context.Theme; import org.springframework.web.servlet.support.RequestContextUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AccessDeniedController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AccessDeniedController.java index cd7f88a7..844776f0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AccessDeniedController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AccessDeniedController.java @@ -1,4 +1,4 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AdvancedSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AdvancedSettingsController.java index 3f9845ee..a682bedd 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AdvancedSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AdvancedSettingsController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.command.AdvancedSettingsCommand; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.command.AdvancedSettingsCommand; -import org.libresonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AllmusicController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AllmusicController.java index c4330069..3af2c772 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AllmusicController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AllmusicController.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AutoCoverDemo.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AutoCoverDemo.java index a5716e80..14fd31c6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AutoCoverDemo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AutoCoverDemo.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2013 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.apache.commons.lang.RandomStringUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java index a3e54c7c..b29e99da 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.Avatar; -import org.libresonic.player.domain.AvatarScheme; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.domain.Avatar; +import org.airsonic.player.domain.AvatarScheme; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java index 252267ab..cdd42070 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java @@ -1,34 +1,34 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.Avatar; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.util.StringUtil; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.libresonic.player.domain.Avatar; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java index abbc2419..942d230b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.MediaFileService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.MediaFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java index d432ab1f..87252700 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java @@ -1,4 +1,4 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.springframework.util.AntPathMatcher; import org.springframework.web.servlet.HandlerMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java index f9d4a46a..97b56b25 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java @@ -1,33 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.dao.AlbumDao; +import org.airsonic.player.dao.ArtistDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; +import org.airsonic.player.service.metadata.JaudiotaggerParser; +import org.airsonic.player.util.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.libresonic.player.dao.AlbumDao; -import org.libresonic.player.dao.ArtistDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.*; -import org.libresonic.player.service.metadata.JaudiotaggerParser; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -292,7 +292,7 @@ public class CoverArtController implements LastModified { } private synchronized File getImageCacheDirectory(int size) { - File dir = new File(SettingsService.getLibresonicHome(), "thumbs"); + File dir = new File(SettingsService.getAirsonicHome(), "thumbs"); dir = new File(dir, String.valueOf(size)); if (!dir.exists()) { if (dir.mkdirs()) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/DBController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DBController.java index b60a7f38..850ef71b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/DBController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/DBController.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.dao.DaoHelper; import org.apache.commons.lang.exception.ExceptionUtils; -import org.libresonic.player.dao.DaoHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.ColumnMapRowMapper; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/DLNASettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DLNASettingsController.java index 462af710..b3d791c0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/DLNASettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/DLNASettingsController.java @@ -1,26 +1,26 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2013 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.UPnPService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.UPnPService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -74,7 +74,7 @@ public class DLNASettingsController { String dlnaServerName = StringUtils.trimToNull(request.getParameter("dlnaServerName")); String dlnaBaseLANURL = StringUtils.trimToNull(request.getParameter("dlnaBaseLANURL")); if (dlnaServerName == null) { - dlnaServerName = "Libresonic"; + dlnaServerName = "Airsonic"; } upnpService.setMediaServerEnabled(false); diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/DatabaseSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DatabaseSettingsController.java index cbe17d65..645c4d1d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/DatabaseSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/DatabaseSettingsController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.command.DatabaseSettingsCommand; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.spring.DataSourceConfigType; +import org.airsonic.player.command.DatabaseSettingsCommand; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.spring.DataSourceConfigType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/DownloadController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DownloadController.java index 5c20e3c4..22958479 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/DownloadController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/DownloadController.java @@ -1,32 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.domain.*; +import org.airsonic.player.io.RangeOutputStream; +import org.airsonic.player.service.*; +import org.airsonic.player.util.FileUtil; +import org.airsonic.player.util.HttpRange; +import org.airsonic.player.util.Util; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.libresonic.player.domain.*; -import org.libresonic.player.io.RangeOutputStream; -import org.libresonic.player.service.*; -import org.libresonic.player.util.FileUtil; -import org.libresonic.player.util.HttpRange; -import org.libresonic.player.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java index 936fd7f6..fbd2aef2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.metadata.JaudiotaggerParser; +import org.airsonic.player.service.metadata.MetaDataParser; +import org.airsonic.player.service.metadata.MetaDataParserFactory; import org.apache.commons.io.FilenameUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.metadata.JaudiotaggerParser; -import org.libresonic.player.service.metadata.MetaDataParser; -import org.libresonic.player.service.metadata.MetaDataParserFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ExportPlayListController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ExportPlayListController.java index 8dbf2a19..5f33aa21 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ExportPlayListController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ExportPlayListController.java @@ -1,9 +1,9 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.service.PlaylistService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java index a69b599d..e88e3be5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import com.auth0.jwt.interfaces.DecodedJWT; +import org.airsonic.player.domain.*; +import org.airsonic.player.security.JWTAuthenticationToken; +import org.airsonic.player.service.*; import org.apache.commons.lang3.StringUtils; -import org.libresonic.player.domain.*; -import org.libresonic.player.security.JWTAuthenticationToken; -import org.libresonic.player.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java index 3355a452..a324d004 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.command.GeneralSettingsCommand; -import org.libresonic.player.domain.Theme; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.command.GeneralSettingsCommand; +import org.airsonic.player.domain.Theme; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/GettingStartedController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/GettingStartedController.java index aab9d27a..aa50867f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/GettingStartedController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/GettingStartedController.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java index 48083506..de0c2ac6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java @@ -1,33 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Player; +import org.airsonic.player.service.JWTSecurityService; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.util.Pair; +import org.airsonic.player.util.StringUtil; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Player; -import org.libresonic.player.service.JWTSecurityService; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.util.Pair; -import org.libresonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java index cee8bfb3..b747bf10 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.VersionService; import org.apache.commons.io.input.ReversedLinesFileReader; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.VersionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java index d95bbaab..6423791b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.*; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java index a077770f..3b75a3a5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java @@ -1,33 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.service.PlaylistService; +import org.airsonic.player.service.SecurityService; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.service.SecurityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/IndexController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/IndexController.java index 56bdc578..0a6a4b1d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/IndexController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/IndexController.java @@ -1,8 +1,8 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java index d689821c..87585875 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.InternetRadio; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.InternetRadio; -import org.libresonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java b/airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java index bfbcf6c0..585ddd0a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java @@ -1,31 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.util.StringUtil; import org.apache.commons.io.IOUtils; import org.eclipse.persistence.jaxb.JAXBContext; import org.eclipse.persistence.jaxb.MarshallerProperties; import org.jdom.Attribute; import org.jdom.Document; import org.jdom.input.SAXBuilder; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.subsonic.restapi.Error; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java index 98676363..bc7bf0c6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.*; -import org.libresonic.player.util.FileUtil; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; +import org.airsonic.player.util.FileUtil; +import org.airsonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/LoginController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/LoginController.java index cfd4d030..e1404495 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/LoginController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/LoginController.java @@ -1,9 +1,9 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/LyricsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/LyricsController.java index da5fd500..7e376cec 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/LyricsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/LyricsController.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java index 4c5dc671..daf4a042 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java @@ -1,32 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.PlayQueue; -import org.libresonic.player.domain.Player; -import org.libresonic.player.service.JWTSecurityService; -import org.libresonic.player.service.NetworkService; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.TranscodingService; -import org.libresonic.player.util.StringUtil; +package org.airsonic.player.controller; + +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.PlayQueue; +import org.airsonic.player.domain.Player; +import org.airsonic.player.service.JWTSecurityService; +import org.airsonic.player.service.NetworkService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.TranscodingService; +import org.airsonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -111,7 +111,7 @@ public class M3UController { out.print("\ufeff"); } out.println("#EXTM3U"); - out.println("#EXTINF:-1,Libresonic"); + out.println("#EXTINF:-1,Airsonic"); out.println(jwtSecurityService.addJWTToken(url)); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java index 5ac100a4..27a52bc9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; import org.apache.commons.lang3.BooleanUtils; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java index 347cd0fb..7df22501 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java @@ -1,28 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.*; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/MusicFolderSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MusicFolderSettingsController.java index 314b88e6..4a705c4b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/MusicFolderSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/MusicFolderSettingsController.java @@ -1,31 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - -import org.libresonic.player.command.MusicFolderSettingsCommand; -import org.libresonic.player.dao.AlbumDao; -import org.libresonic.player.dao.ArtistDao; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.service.MediaScannerService; -import org.libresonic.player.service.SettingsService; +package org.airsonic.player.controller; + +import org.airsonic.player.command.MusicFolderSettingsCommand; +import org.airsonic.player.dao.AlbumDao; +import org.airsonic.player.dao.ArtistDao; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.service.MediaScannerService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/NotFoundController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/NotFoundController.java index 6654a9ad..67aded4c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/NotFoundController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/NotFoundController.java @@ -1,4 +1,4 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/NowPlayingController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/NowPlayingController.java index 42fa949c..9b8258c1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/NowPlayingController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/NowPlayingController.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.TransferStatus; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.StatusService; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.TransferStatus; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.StatusService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PasswordSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PasswordSettingsController.java index 40d98eea..b4331587 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PasswordSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PasswordSettingsController.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.command.PasswordSettingsCommand; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.validator.PasswordSettingsValidator; +import org.airsonic.player.command.PasswordSettingsCommand; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.validator.PasswordSettingsValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java index 309378b6..44899d36 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.command.PersonalSettingsCommand; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.command.PersonalSettingsCommand; -import org.libresonic.player.domain.*; -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.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PlayQueueController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayQueueController.java index 53b2b647..d0b765ca 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PlayQueueController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayQueueController.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.User; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.User; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java index 4f6bcd24..53e325e7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.command.PlayerSettingsCommand; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.TranscodingService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.command.PlayerSettingsCommand; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.TranscodingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistController.java index 7dbf146c..f7538386 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistController.java @@ -1,32 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.domain.User; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; +package org.airsonic.player.controller; + +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.domain.User; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.PlaylistService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistsController.java index d6e99b64..8b9eed63 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistsController.java @@ -1,27 +1,27 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2014 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.service.SecurityService; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.PlaylistService; +import org.airsonic.player.service.SecurityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelController.java index 323a1948..2b7c53fc 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelController.java @@ -1,26 +1,26 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.service.PodcastService; -import org.libresonic.player.service.SecurityService; +import org.airsonic.player.service.PodcastService; +import org.airsonic.player.service.SecurityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelsController.java index c20fb376..42946cb1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelsController.java @@ -1,28 +1,28 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.PodcastChannel; -import org.libresonic.player.domain.PodcastEpisode; -import org.libresonic.player.service.PodcastService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.domain.PodcastChannel; +import org.airsonic.player.domain.PodcastEpisode; +import org.airsonic.player.service.PodcastService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java index 27ac4865..b3a1dc0b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.util.StringUtil; +package org.airsonic.player.controller; + +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.service.PlaylistService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastReceiverAdminController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastReceiverAdminController.java index f3190e1d..ba0bf4ca 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastReceiverAdminController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastReceiverAdminController.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.PodcastEpisode; +import org.airsonic.player.domain.PodcastStatus; +import org.airsonic.player.service.PodcastService; +import org.airsonic.player.util.StringUtil; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.PodcastEpisode; -import org.libresonic.player.domain.PodcastStatus; -import org.libresonic.player.service.PodcastService; -import org.libresonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastSettingsController.java index d8dbb347..4006384a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastSettingsController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.command.PodcastSettingsCommand; -import org.libresonic.player.service.PodcastService; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.command.PodcastSettingsCommand; +import org.airsonic.player.service.PodcastService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java index 5a21ed0f..7081d9bd 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.apache.commons.io.IOUtils; import org.apache.http.HttpStatus; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RESTController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RESTController.java index e3c80b7e..d4b63dc5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/RESTController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RESTController.java @@ -1,47 +1,36 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.ajax.LyricsInfo; +import org.airsonic.player.ajax.LyricsService; +import org.airsonic.player.ajax.PlayQueueService; +import org.airsonic.player.command.UserSettingsCommand; +import org.airsonic.player.dao.*; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; +import org.airsonic.player.util.Pair; +import org.airsonic.player.util.StringUtil; +import org.airsonic.player.util.Util; import org.apache.commons.lang.StringUtils; import org.apache.http.HttpStatus; -import org.libresonic.player.ajax.LyricsInfo; -import org.libresonic.player.ajax.LyricsService; -import org.libresonic.player.ajax.PlayQueueService; -import org.libresonic.player.command.UserSettingsCommand; -import org.libresonic.player.dao.*; -import org.libresonic.player.domain.*; -import org.libresonic.player.domain.Artist; -import org.libresonic.player.domain.Bookmark; -import org.libresonic.player.domain.Genre; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.PlayQueue; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.domain.PodcastChannel; -import org.libresonic.player.domain.PodcastEpisode; -import org.libresonic.player.domain.SearchResult; -import org.libresonic.player.domain.Share; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.*; -import org.libresonic.player.util.Pair; -import org.libresonic.player.util.StringUtil; -import org.libresonic.player.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -62,7 +51,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import static org.libresonic.player.security.RESTRequestParameterProcessingFilter.decrypt; +import static org.airsonic.player.security.RESTRequestParameterProcessingFilter.decrypt; import static org.springframework.web.bind.ServletRequestUtils.*; /** @@ -141,7 +130,7 @@ public class RESTController { @Autowired private MediaScannerService mediaScannerService; - private final Map bookmarkCache = new ConcurrentHashMap(); + private final Map bookmarkCache = new ConcurrentHashMap(); private final JAXBWriter jaxbWriter = new JAXBWriter(); private static final String NOT_YET_IMPLEMENTED = "Not yet implemented"; @@ -154,7 +143,7 @@ public class RESTController { private void refreshBookmarkCache() { bookmarkCache.clear(); - for (Bookmark bookmark : bookmarkDao.getBookmarks()) { + for (org.airsonic.player.domain.Bookmark bookmark : bookmarkDao.getBookmarks()) { bookmarkCache.put(BookmarkKey.forBookmark(bookmark), bookmark); } } @@ -179,7 +168,7 @@ public class RESTController { License license = new License(); - license.setEmail("libresonic@github.com"); + license.setEmail("airsonic@github.com"); license.setValid(true); Date neverExpireDate = new Date(Long.MAX_VALUE); license.setLicenseExpires(jaxbWriter.convertDate(neverExpireDate)); @@ -197,7 +186,7 @@ public class RESTController { MusicFolders musicFolders = new MusicFolders(); String username = securityService.getCurrentUsername(request); - for (MusicFolder musicFolder : settingsService.getMusicFoldersForUser(username)) { + for (org.airsonic.player.domain.MusicFolder musicFolder : settingsService.getMusicFoldersForUser(username)) { org.subsonic.restapi.MusicFolder mf = new org.subsonic.restapi.MusicFolder(); mf.setId(musicFolder.getId()); mf.setName(musicFolder.getName()); @@ -226,10 +215,10 @@ public class RESTController { indexes.setLastModified(lastModified); indexes.setIgnoredArticles(settingsService.getIgnoredArticles()); - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); Integer musicFolderId = getIntParameter(request, "musicFolderId"); if (musicFolderId != null) { - for (MusicFolder musicFolder : musicFolders) { + for (org.airsonic.player.domain.MusicFolder musicFolder : musicFolders) { if (musicFolderId.equals(musicFolder.getId())) { musicFolders = Collections.singletonList(musicFolder); break; @@ -283,7 +272,7 @@ public class RESTController { request = wrapRequest(request); org.subsonic.restapi.Genres genres = new org.subsonic.restapi.Genres(); - for (Genre genre : mediaFileDao.getGenres(false)) { + for (org.airsonic.player.domain.Genre genre : mediaFileDao.getGenres(false)) { org.subsonic.restapi.Genre g = new org.subsonic.restapi.Genre(); genres.getGenre().add(g); g.setContent(genre.getName()); @@ -308,7 +297,7 @@ public class RESTController { int count = getIntParameter(request, "count", 10); count = Math.max(0, Math.min(count, 500)); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); for (MediaFile mediaFile : mediaFileDao.getSongsByGenre(genre, offset, count, musicFolders)) { songs.getSong().add(createJaxbChild(player, mediaFile, username)); @@ -325,9 +314,9 @@ public class RESTController { ArtistsID3 result = new ArtistsID3(); result.setIgnoredArticles(settingsService.getIgnoredArticles()); - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); - List artists = artistDao.getAlphabetialArtists(0, Integer.MAX_VALUE, musicFolders); + List artists = artistDao.getAlphabetialArtists(0, Integer.MAX_VALUE, musicFolders); SortedMap> indexedArtists = musicIndexService.getIndexedArtists(artists); for (Map.Entry> entry : indexedArtists.entrySet()) { IndexID3 index = new IndexID3(); @@ -358,7 +347,7 @@ public class RESTController { error(request, response, ErrorCode.NOT_FOUND, "Media file not found."); return; } - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); List similarSongs = lastFmService.getSimilarSongs(mediaFile, count, musicFolders); Player player = playerService.getPlayer(request, response); for (MediaFile similarSong : similarSongs) { @@ -380,13 +369,13 @@ public class RESTController { SimilarSongs2 result = new SimilarSongs2(); - Artist artist = artistDao.getArtist(id); + org.airsonic.player.domain.Artist artist = artistDao.getArtist(id); if (artist == null) { error(request, response, ErrorCode.NOT_FOUND, "Artist not found."); return; } - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); List similarSongs = lastFmService.getSimilarSongs(artist, count, musicFolders); Player player = playerService.getPlayer(request, response); for (MediaFile similarSong : similarSongs) { @@ -408,7 +397,7 @@ public class RESTController { TopSongs result = new TopSongs(); - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); List topSongs = lastFmService.getTopSongs(artist, count, musicFolders); Player player = playerService.getPlayer(request, response); for (MediaFile topSong : topSongs) { @@ -436,7 +425,7 @@ public class RESTController { error(request, response, ErrorCode.NOT_FOUND, "Media file not found."); return; } - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); List similarArtists = lastFmService.getSimilarArtists(mediaFile, count, includeNotPresent, musicFolders); for (MediaFile similarArtist : similarArtists) { result.getSimilarArtist().add(createJaxbArtist(similarArtist, username)); @@ -467,15 +456,15 @@ public class RESTController { ArtistInfo2 result = new ArtistInfo2(); - Artist artist = artistDao.getArtist(id); + org.airsonic.player.domain.Artist artist = artistDao.getArtist(id); if (artist == null) { error(request, response, ErrorCode.NOT_FOUND, "Artist not found."); return; } - List musicFolders = settingsService.getMusicFoldersForUser(username); - List similarArtists = lastFmService.getSimilarArtists(artist, count, includeNotPresent, musicFolders); - for (Artist similarArtist : similarArtists) { + List musicFolders = settingsService.getMusicFoldersForUser(username); + List similarArtists = lastFmService.getSimilarArtists(artist, count, includeNotPresent, musicFolders); + for (org.airsonic.player.domain.Artist similarArtist : similarArtists) { result.getSimilarArtist().add(createJaxbArtist(new ArtistID3(), similarArtist, username)); } ArtistBio artistBio = lastFmService.getArtistBio(artist); @@ -493,7 +482,7 @@ public class RESTController { jaxbWriter.writeResponse(request, response, res); } - private T createJaxbArtist(T jaxbArtist, Artist artist, String username) { + private T createJaxbArtist(T jaxbArtist, org.airsonic.player.domain.Artist artist, String username) { jaxbArtist.setId(String.valueOf(artist.getId())); jaxbArtist.setName(artist.getName()); jaxbArtist.setStarred(jaxbWriter.convertDate(mediaFileDao.getMediaFileStarredDate(artist.getId(), username))); @@ -519,13 +508,13 @@ public class RESTController { String username = securityService.getCurrentUsername(request); int id = getRequiredIntParameter(request, "id"); - Artist artist = artistDao.getArtist(id); + org.airsonic.player.domain.Artist artist = artistDao.getArtist(id); if (artist == null) { error(request, response, ErrorCode.NOT_FOUND, "Artist not found."); return; } - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); ArtistWithAlbumsID3 result = createJaxbArtist(new ArtistWithAlbumsID3(), artist, username); for (Album album : albumDao.getAlbumsForArtist(artist.getName(), musicFolders)) { result.getAlbum().add(createJaxbAlbum(new AlbumID3(), album, username)); @@ -541,7 +530,7 @@ public class RESTController { jaxbAlbum.setName(album.getName()); if (album.getArtist() != null) { jaxbAlbum.setArtist(album.getArtist()); - Artist artist = artistDao.getArtist(album.getArtist()); + org.airsonic.player.domain.Artist artist = artistDao.getArtist(album.getArtist()); if (artist != null) { jaxbAlbum.setArtistId(String.valueOf(artist.getId())); } @@ -558,7 +547,7 @@ public class RESTController { return jaxbAlbum; } - private T createJaxbPlaylist(T jaxbPlaylist, Playlist playlist) { + private T createJaxbPlaylist(T jaxbPlaylist, org.airsonic.player.domain.Playlist playlist) { jaxbPlaylist.setId(String.valueOf(playlist.getId())); jaxbPlaylist.setName(playlist.getName()); jaxbPlaylist.setComment(playlist.getComment()); @@ -695,9 +684,9 @@ public class RESTController { criteria.setQuery(query.toString().trim()); criteria.setCount(getIntParameter(request, "count", 20)); criteria.setOffset(getIntParameter(request, "offset", 0)); - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); - SearchResult result = searchService.search(criteria, musicFolders, SearchService.IndexType.SONG); + org.airsonic.player.domain.SearchResult result = searchService.search(criteria, musicFolders, SearchService.IndexType.SONG); org.subsonic.restapi.SearchResult searchResult = new org.subsonic.restapi.SearchResult(); searchResult.setOffset(result.getOffset()); searchResult.setTotalHits(result.getTotalHits()); @@ -716,7 +705,7 @@ public class RESTController { Player player = playerService.getPlayer(request, response); String username = securityService.getCurrentUsername(request); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); SearchResult2 searchResult = new SearchResult2(); @@ -725,21 +714,21 @@ public class RESTController { criteria.setQuery(StringUtils.trimToEmpty(query)); criteria.setCount(getIntParameter(request, "artistCount", 20)); criteria.setOffset(getIntParameter(request, "artistOffset", 0)); - SearchResult artists = searchService.search(criteria, musicFolders, SearchService.IndexType.ARTIST); + org.airsonic.player.domain.SearchResult artists = searchService.search(criteria, musicFolders, SearchService.IndexType.ARTIST); for (MediaFile mediaFile : artists.getMediaFiles()) { searchResult.getArtist().add(createJaxbArtist(mediaFile, username)); } criteria.setCount(getIntParameter(request, "albumCount", 20)); criteria.setOffset(getIntParameter(request, "albumOffset", 0)); - SearchResult albums = searchService.search(criteria, musicFolders, SearchService.IndexType.ALBUM); + org.airsonic.player.domain.SearchResult albums = searchService.search(criteria, musicFolders, SearchService.IndexType.ALBUM); for (MediaFile mediaFile : albums.getMediaFiles()) { searchResult.getAlbum().add(createJaxbChild(player, mediaFile, username)); } criteria.setCount(getIntParameter(request, "songCount", 20)); criteria.setOffset(getIntParameter(request, "songOffset", 0)); - SearchResult songs = searchService.search(criteria, musicFolders, SearchService.IndexType.SONG); + org.airsonic.player.domain.SearchResult songs = searchService.search(criteria, musicFolders, SearchService.IndexType.SONG); for (MediaFile mediaFile : songs.getMediaFiles()) { searchResult.getSong().add(createJaxbChild(player, mediaFile, username)); } @@ -755,7 +744,7 @@ public class RESTController { Player player = playerService.getPlayer(request, response); String username = securityService.getCurrentUsername(request); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); SearchResult3 searchResult = new SearchResult3(); @@ -764,8 +753,8 @@ public class RESTController { criteria.setQuery(StringUtils.trimToEmpty(query)); criteria.setCount(getIntParameter(request, "artistCount", 20)); criteria.setOffset(getIntParameter(request, "artistOffset", 0)); - SearchResult result = searchService.search(criteria, musicFolders, SearchService.IndexType.ARTIST_ID3); - for (Artist artist : result.getArtists()) { + org.airsonic.player.domain.SearchResult result = searchService.search(criteria, musicFolders, SearchService.IndexType.ARTIST_ID3); + for (org.airsonic.player.domain.Artist artist : result.getArtists()) { searchResult.getArtist().add(createJaxbArtist(new ArtistID3(), artist, username)); } @@ -792,7 +781,7 @@ public class RESTController { public void getPlaylists(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); String authenticatedUsername = user.getUsername(); String requestedUsername = request.getParameter("username"); @@ -805,7 +794,7 @@ public class RESTController { Playlists result = new Playlists(); - for (Playlist playlist : playlistService.getReadablePlaylistsForUser(requestedUsername)) { + for (org.airsonic.player.domain.Playlist playlist : playlistService.getReadablePlaylistsForUser(requestedUsername)) { result.getPlaylist().add(createJaxbPlaylist(new org.subsonic.restapi.Playlist(), playlist)); } @@ -822,7 +811,7 @@ public class RESTController { int id = getRequiredIntParameter(request, "id"); - Playlist playlist = playlistService.getPlaylist(id); + org.airsonic.player.domain.Playlist playlist = playlistService.getPlaylist(id); if (playlist == null) { error(request, response, ErrorCode.NOT_FOUND, "Playlist not found: " + id); return; @@ -847,7 +836,7 @@ public class RESTController { public void jukeboxControl(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request, true); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isJukeboxRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to use jukebox."); return; @@ -891,11 +880,11 @@ public class RESTController { String username = securityService.getCurrentUsername(request); Player jukeboxPlayer = jukeboxService.getPlayer(); boolean controlsJukebox = jukeboxPlayer != null && jukeboxPlayer.getId().equals(player.getId()); - PlayQueue playQueue = player.getPlayQueue(); + org.airsonic.player.domain.PlayQueue playQueue = player.getPlayQueue(); int currentIndex = controlsJukebox && !playQueue.isEmpty() ? playQueue.getIndex() : -1; - boolean playing = controlsJukebox && !playQueue.isEmpty() && playQueue.getStatus() == PlayQueue.Status.PLAYING; + boolean playing = controlsJukebox && !playQueue.isEmpty() && playQueue.getStatus() == org.airsonic.player.domain.PlayQueue.Status.PLAYING; float gain = jukeboxService.getGain(); int position = controlsJukebox && !playQueue.isEmpty() ? jukeboxService.getPosition() : 0; @@ -934,7 +923,7 @@ public class RESTController { return; } - Playlist playlist; + org.airsonic.player.domain.Playlist playlist; if (playlistId != null) { playlist = playlistService.getPlaylist(playlistId); if (playlist == null) { @@ -946,7 +935,7 @@ public class RESTController { return; } } else { - playlist = new Playlist(); + playlist = new org.airsonic.player.domain.Playlist(); playlist.setName(name); playlist.setCreated(new Date()); playlist.setChanged(new Date()); @@ -973,7 +962,7 @@ public class RESTController { String username = securityService.getCurrentUsername(request); int id = getRequiredIntParameter(request, "playlistId"); - Playlist playlist = playlistService.getPlaylist(id); + org.airsonic.player.domain.Playlist playlist = playlistService.getPlaylist(id); if (playlist == null) { error(request, response, ErrorCode.NOT_FOUND, "Playlist not found: " + id); return; @@ -1041,7 +1030,7 @@ public class RESTController { String username = securityService.getCurrentUsername(request); int id = getRequiredIntParameter(request, "id"); - Playlist playlist = playlistService.getPlaylist(id); + org.airsonic.player.domain.Playlist playlist = playlistService.getPlaylist(id); if (playlist == null) { error(request, response, ErrorCode.NOT_FOUND, "Playlist not found: " + id); return; @@ -1065,7 +1054,7 @@ public class RESTController { int offset = getIntParameter(request, "offset", 0); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); size = Math.max(0, Math.min(size, 500)); String type = getRequiredStringParameter(request, "type"); @@ -1116,7 +1105,7 @@ public class RESTController { String type = getRequiredStringParameter(request, "type"); String username = securityService.getCurrentUsername(request); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); List albums; if ("frequent".equals(type)) { @@ -1162,7 +1151,7 @@ public class RESTController { Integer fromYear = getIntParameter(request, "fromYear"); Integer toYear = getIntParameter(request, "toYear"); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); RandomSearchCriteria criteria = new RandomSearchCriteria(size, genre, fromYear, toYear, musicFolders); Songs result = new Songs(); @@ -1182,7 +1171,7 @@ public class RESTController { int size = getIntParameter(request, "size", Integer.MAX_VALUE); int offset = getIntParameter(request, "offset", 0); - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); Videos result = new Videos(); for (MediaFile mediaFile : mediaFileDao.getVideos(size, offset, musicFolders)) { @@ -1267,7 +1256,7 @@ public class RESTController { child.setIsVideo(mediaFile.isVideo()); child.setPath(getRelativePath(mediaFile)); - Bookmark bookmark = bookmarkCache.get(new BookmarkKey(username, mediaFile.getId())); + org.airsonic.player.domain.Bookmark bookmark = bookmarkCache.get(new BookmarkKey(username, mediaFile.getId())); if (bookmark != null) { child.setBookmarkPosition(bookmark.getPositionMillis()); } @@ -1279,7 +1268,7 @@ public class RESTController { } } if (mediaFile.getArtist() != null) { - Artist artist = artistDao.getArtist(mediaFile.getArtist()); + org.airsonic.player.domain.Artist artist = artistDao.getArtist(mediaFile.getArtist()); if (artist != null) { child.setArtistId(String.valueOf(artist.getId())); } @@ -1329,8 +1318,8 @@ public class RESTController { String filePathLower = filePath.toLowerCase(); - List musicFolders = settingsService.getAllMusicFolders(false, true); - for (MusicFolder musicFolder : musicFolders) { + List musicFolders = settingsService.getAllMusicFolders(false, true); + for (org.airsonic.player.domain.MusicFolder musicFolder : musicFolders) { String folderPath = musicFolder.getPath().getPath(); folderPath = folderPath.replace('\\', '/'); String folderPathLower = folderPath.toLowerCase(); @@ -1350,7 +1339,7 @@ public class RESTController { @RequestMapping(value = "/download") public ModelAndView download(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isDownloadRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to download files."); return null; @@ -1374,7 +1363,7 @@ public class RESTController { @RequestMapping(value = "/stream") public ModelAndView stream(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isStreamRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to play files."); return null; @@ -1387,7 +1376,7 @@ public class RESTController { @RequestMapping(value = "/hls") public ModelAndView hls(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isStreamRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to play files."); return null; @@ -1478,7 +1467,7 @@ public class RESTController { } } for (int artistId : getIntParameters(request, "artistId")) { - Artist artist = artistDao.getArtist(artistId); + org.airsonic.player.domain.Artist artist = artistDao.getArtist(artistId); if (artist == null) { error(request, response, ErrorCode.NOT_FOUND, "Artist not found: " + artistId); return; @@ -1499,7 +1488,7 @@ public class RESTController { Player player = playerService.getPlayer(request, response); String username = securityService.getCurrentUsername(request); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); Starred result = new Starred(); for (MediaFile artist : mediaFileDao.getStarredDirectories(0, Integer.MAX_VALUE, username, musicFolders)) { @@ -1522,10 +1511,10 @@ public class RESTController { Player player = playerService.getPlayer(request, response); String username = securityService.getCurrentUsername(request); Integer musicFolderId = getIntParameter(request, "musicFolderId"); - List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); + List musicFolders = settingsService.getMusicFoldersForUser(username, musicFolderId); Starred2 result = new Starred2(); - for (Artist artist : artistDao.getStarredArtists(0, Integer.MAX_VALUE, username, musicFolders)) { + for (org.airsonic.player.domain.Artist artist : artistDao.getStarredArtists(0, Integer.MAX_VALUE, username, musicFolders)) { result.getArtist().add(createJaxbArtist(new ArtistID3(), artist, username)); } for (Album album : albumDao.getStarredAlbums(0, Integer.MAX_VALUE, username, musicFolders)) { @@ -1549,7 +1538,7 @@ public class RESTController { Podcasts result = new Podcasts(); - for (PodcastChannel channel : podcastService.getAllChannels()) { + for (org.airsonic.player.domain.PodcastChannel channel : podcastService.getAllChannels()) { if (channelId == null || channelId.equals(channel.getId())) { org.subsonic.restapi.PodcastChannel c = new org.subsonic.restapi.PodcastChannel(); @@ -1565,8 +1554,8 @@ public class RESTController { c.setErrorMessage(channel.getErrorMessage()); if (includeEpisodes) { - List episodes = podcastService.getEpisodes(channel.getId()); - for (PodcastEpisode episode : episodes) { + List episodes = podcastService.getEpisodes(channel.getId()); + for (org.airsonic.player.domain.PodcastEpisode episode : episodes) { c.getEpisode().add(createJaxbPodcastEpisode(player, username, episode)); } } @@ -1586,7 +1575,7 @@ public class RESTController { int count = getIntParameter(request, "count", 20); NewestPodcasts result = new NewestPodcasts(); - for (PodcastEpisode episode : podcastService.getNewestEpisodes(count)) { + for (org.airsonic.player.domain.PodcastEpisode episode : podcastService.getNewestEpisodes(count)) { result.getEpisode().add(createJaxbPodcastEpisode(player, username, episode)); } @@ -1595,7 +1584,7 @@ public class RESTController { jaxbWriter.writeResponse(request, response, res); } - private org.subsonic.restapi.PodcastEpisode createJaxbPodcastEpisode(Player player, String username, PodcastEpisode episode) { + private org.subsonic.restapi.PodcastEpisode createJaxbPodcastEpisode(Player player, String username, org.airsonic.player.domain.PodcastEpisode episode) { org.subsonic.restapi.PodcastEpisode e = new org.subsonic.restapi.PodcastEpisode(); String path = episode.getPath(); @@ -1617,7 +1606,7 @@ public class RESTController { @RequestMapping(value = "/refreshPodcasts") public void refreshPodcasts(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isPodcastRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to administrate podcasts."); return; @@ -1629,7 +1618,7 @@ public class RESTController { @RequestMapping(value = "/createPodcastChannel") public void createPodcastChannel(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isPodcastRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to administrate podcasts."); return; @@ -1643,7 +1632,7 @@ public class RESTController { @RequestMapping(value = "/deletePodcastChannel") public void deletePodcastChannel(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isPodcastRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to administrate podcasts."); return; @@ -1657,7 +1646,7 @@ public class RESTController { @RequestMapping(value = "/deletePodcastEpisode") public void deletePodcastEpisode(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isPodcastRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to administrate podcasts."); return; @@ -1671,14 +1660,14 @@ public class RESTController { @RequestMapping(value = "/downloadPodcastEpisode") public void downloadPodcastEpisode(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isPodcastRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to administrate podcasts."); return; } int id = getRequiredIntParameter(request, "id"); - PodcastEpisode episode = podcastService.getEpisode(id, true); + org.airsonic.player.domain.PodcastEpisode episode = podcastService.getEpisode(id, true); if (episode == null) { error(request, response, ErrorCode.NOT_FOUND, "Podcast episode " + id + " not found."); return; @@ -1713,7 +1702,7 @@ public class RESTController { String username = securityService.getCurrentUsername(request); Bookmarks result = new Bookmarks(); - for (Bookmark bookmark : bookmarkDao.getBookmarks(username)) { + for (org.airsonic.player.domain.Bookmark bookmark : bookmarkDao.getBookmarks(username)) { org.subsonic.restapi.Bookmark b = new org.subsonic.restapi.Bookmark(); result.getBookmark().add(b); b.setPosition(bookmark.getPositionMillis()); @@ -1740,7 +1729,7 @@ public class RESTController { String comment = request.getParameter("comment"); Date now = new Date(); - Bookmark bookmark = new Bookmark(0, mediaFileId, position, username, comment, now, now); + org.airsonic.player.domain.Bookmark bookmark = new org.airsonic.player.domain.Bookmark(0, mediaFileId, position, username, comment, now, now); bookmarkDao.createOrUpdateBookmark(bookmark); refreshBookmarkCache(); writeEmptyResponse(request, response); @@ -1814,11 +1803,11 @@ public class RESTController { request = wrapRequest(request); Player player = playerService.getPlayer(request, response); String username = securityService.getCurrentUsername(request); - User user = securityService.getCurrentUser(request); - List musicFolders = settingsService.getMusicFoldersForUser(username); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); + List musicFolders = settingsService.getMusicFoldersForUser(username); Shares result = new Shares(); - for (Share share : shareService.getSharesForUser(user)) { + for (org.airsonic.player.domain.Share share : shareService.getSharesForUser(user)) { org.subsonic.restapi.Share s = createJaxbShare(request, share); result.getShare().add(s); @@ -1837,7 +1826,7 @@ public class RESTController { Player player = playerService.getPlayer(request, response); String username = securityService.getCurrentUsername(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isShareRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to share media."); return; @@ -1848,7 +1837,7 @@ public class RESTController { files.add(mediaFileService.getMediaFile(id)); } - Share share = shareService.createShare(request, files); + org.airsonic.player.domain.Share share = shareService.createShare(request, files); share.setDescription(request.getParameter("description")); long expires = getLongParameter(request, "expires", 0L); if (expires != 0) { @@ -1860,7 +1849,7 @@ public class RESTController { org.subsonic.restapi.Share s = createJaxbShare(request, share); result.getShare().add(s); - List musicFolders = settingsService.getMusicFoldersForUser(username); + List musicFolders = settingsService.getMusicFoldersForUser(username); for (MediaFile mediaFile : shareService.getSharedFiles(share.getId(), musicFolders)) { s.getEntry().add(createJaxbChild(player, mediaFile, username)); @@ -1874,10 +1863,10 @@ public class RESTController { @RequestMapping(value = "/deleteShare") public void deleteShare(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); int id = getRequiredIntParameter(request, "id"); - Share share = shareService.getShareById(id); + org.airsonic.player.domain.Share share = shareService.getShareById(id); if (share == null) { error(request, response, ErrorCode.NOT_FOUND, "Shared media not found."); return; @@ -1894,10 +1883,10 @@ public class RESTController { @RequestMapping(value = "/updateShare") public void updateShare(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); int id = getRequiredIntParameter(request, "id"); - Share share = shareService.getShareById(id); + org.airsonic.player.domain.Share share = shareService.getShareById(id); if (share == null) { error(request, response, ErrorCode.NOT_FOUND, "Shared media not found."); return; @@ -1917,7 +1906,7 @@ public class RESTController { writeEmptyResponse(request, response); } - private org.subsonic.restapi.Share createJaxbShare(HttpServletRequest request, Share share) { + private org.subsonic.restapi.Share createJaxbShare(HttpServletRequest request, org.airsonic.player.domain.Share share) { org.subsonic.restapi.Share result = new org.subsonic.restapi.Share(); result.setId(String.valueOf(share.getId())); result.setUrl(shareService.getShareUrl(request, share)); @@ -1983,7 +1972,7 @@ public class RESTController { String username = getRequiredStringParameter(request, "username"); String password = decrypt(getRequiredStringParameter(request, "password")); - User authUser = securityService.getCurrentUser(request); + org.airsonic.player.domain.User authUser = securityService.getCurrentUser(request); boolean allowed = authUser.isAdminRole() || username.equals(authUser.getUsername()) && authUser.isSettingsRole(); @@ -1993,7 +1982,7 @@ public class RESTController { return; } - User user = securityService.getUserByName(username); + org.airsonic.player.domain.User user = securityService.getUserByName(username); user.setPassword(password); securityService.updateUser(user); @@ -2006,13 +1995,13 @@ public class RESTController { String username = getRequiredStringParameter(request, "username"); - User currentUser = securityService.getCurrentUser(request); + org.airsonic.player.domain.User currentUser = securityService.getCurrentUser(request); if (!username.equals(currentUser.getUsername()) && !currentUser.isAdminRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, currentUser.getUsername() + " is not authorized to get details for other users."); return; } - User requestedUser = securityService.getUserByName(username); + org.airsonic.player.domain.User requestedUser = securityService.getUserByName(username); if (requestedUser == null) { error(request, response, ErrorCode.NOT_FOUND, "No such user: " + username); return; @@ -2027,14 +2016,14 @@ public class RESTController { public void getUsers(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User currentUser = securityService.getCurrentUser(request); + org.airsonic.player.domain.User currentUser = securityService.getCurrentUser(request); if (!currentUser.isAdminRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, currentUser.getUsername() + " is not authorized to get details for other users."); return; } Users result = new Users(); - for (User user : securityService.getAllUsers()) { + for (org.airsonic.player.domain.User user : securityService.getAllUsers()) { result.getUser().add(createJaxbUser(user)); } @@ -2043,7 +2032,7 @@ public class RESTController { jaxbWriter.writeResponse(request, response, res); } - private org.subsonic.restapi.User createJaxbUser(User user) { + private org.subsonic.restapi.User createJaxbUser(org.airsonic.player.domain.User user) { UserSettings userSettings = settingsService.getUserSettings(user.getUsername()); org.subsonic.restapi.User result = new org.subsonic.restapi.User(); @@ -2061,7 +2050,7 @@ public class RESTController { result.setStreamRole(user.isStreamRole()); result.setJukeboxRole(user.isJukeboxRole()); result.setShareRole(user.isShareRole()); - // currently this role isn't supported by libresonic + // currently this role isn't supported by airsonic result.setVideoConversionRole(false); // Useless result.setAvatarLastChanged(null); @@ -2071,8 +2060,8 @@ public class RESTController { result.setMaxBitRate(transcodeScheme.getMaxBitRate()); } - List musicFolders = settingsService.getMusicFoldersForUser(user.getUsername()); - for (MusicFolder musicFolder : musicFolders) { + List musicFolders = settingsService.getMusicFoldersForUser(user.getUsername()); + for (org.airsonic.player.domain.MusicFolder musicFolder : musicFolders) { result.getFolder().add(musicFolder.getId()); } return result; @@ -2081,7 +2070,7 @@ public class RESTController { @RequestMapping(value = "/createUser") public void createUser(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isAdminRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to create new users."); return; @@ -2106,7 +2095,7 @@ public class RESTController { int[] folderIds = ServletRequestUtils.getIntParameters(request, "musicFolderId"); if (folderIds.length == 0) { - folderIds = Util.toIntArray(MusicFolder.toIdList(settingsService.getAllMusicFolders())); + folderIds = Util.toIntArray(org.airsonic.player.domain.MusicFolder.toIdList(settingsService.getAllMusicFolders())); } command.setAllowedMusicFolderIds(folderIds); @@ -2117,20 +2106,20 @@ public class RESTController { @RequestMapping(value = "/updateUser") public void updateUser(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isAdminRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to update users."); return; } String username = getRequiredStringParameter(request, "username"); - User u = securityService.getUserByName(username); + org.airsonic.player.domain.User u = securityService.getUserByName(username); UserSettings s = settingsService.getUserSettings(username); if (u == null) { error(request, response, ErrorCode.NOT_FOUND, "No such user: " + username); return; - } else if (User.USERNAME_ADMIN.equals(username)) { + } else if (org.airsonic.player.domain.User.USERNAME_ADMIN.equals(username)) { error(request, response, ErrorCode.NOT_AUTHORIZED, "Not allowed to change admin user"); return; } @@ -2160,7 +2149,7 @@ public class RESTController { int[] folderIds = ServletRequestUtils.getIntParameters(request, "musicFolderId"); if (folderIds.length == 0) { - folderIds = Util.toIntArray(MusicFolder.toIdList(settingsService.getMusicFoldersForUser(username))); + folderIds = Util.toIntArray(org.airsonic.player.domain.MusicFolder.toIdList(settingsService.getMusicFoldersForUser(username))); } command.setAllowedMusicFolderIds(folderIds); @@ -2175,14 +2164,14 @@ public class RESTController { @RequestMapping(value = "/deleteUser") public void deleteUser(HttpServletRequest request, HttpServletResponse response) throws Exception { request = wrapRequest(request); - User user = securityService.getCurrentUser(request); + org.airsonic.player.domain.User user = securityService.getCurrentUser(request); if (!user.isAdminRole()) { error(request, response, ErrorCode.NOT_AUTHORIZED, user.getUsername() + " is not authorized to delete users."); return; } String username = getRequiredStringParameter(request, "username"); - if (User.USERNAME_ADMIN.equals(username)) { + if (org.airsonic.player.domain.User.USERNAME_ADMIN.equals(username)) { error(request, response, ErrorCode.NOT_AUTHORIZED, "Not allowed to delete admin user"); return; } @@ -2402,8 +2391,8 @@ public class RESTController { GENERIC(0, "A generic error."), MISSING_PARAMETER(10, "Required parameter is missing."), - PROTOCOL_MISMATCH_CLIENT_TOO_OLD(20, "Incompatible Libresonic REST protocol version. Client must upgrade."), - PROTOCOL_MISMATCH_SERVER_TOO_OLD(30, "Incompatible Libresonic REST protocol version. Server must upgrade."), + PROTOCOL_MISMATCH_CLIENT_TOO_OLD(20, "Incompatible Airsonic REST protocol version. Client must upgrade."), + PROTOCOL_MISMATCH_SERVER_TOO_OLD(30, "Incompatible Airsonic REST protocol version. Server must upgrade."), NOT_AUTHENTICATED(40, "Wrong username or password."), NOT_AUTHORIZED(50, "User is not authorized for the given operation."), NOT_FOUND(70, "Requested data was not found."); @@ -2430,7 +2419,7 @@ public class RESTController { super(username, mediaFileId); } - static BookmarkKey forBookmark(Bookmark b) { + static BookmarkKey forBookmark(org.airsonic.player.domain.Bookmark b) { return new BookmarkKey(b.getUsername(), b.getMediaFileId()); } } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java index 29dba657..c7996cb1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.PlayerService; -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.ui.ModelMap; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java index 2c91d060..b5e6f559 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java @@ -1,13 +1,13 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import net.tanesha.recaptcha.ReCaptcha; import net.tanesha.recaptcha.ReCaptchaFactory; import net.tanesha.recaptcha.ReCaptchaResponse; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -132,14 +132,14 @@ public class RecoverController { Message message = new MimeMessage(session); message.setFrom(new InternetAddress(settingsService.getSmtpFrom())); message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(email)); - message.setSubject("Libresonic Password"); + message.setSubject("Airsonic Password"); message.setText("Hi there!\n\n" + - "You have requested to reset your Libresonic password. Please find your new login details below.\n\n" + + "You have requested to reset your Airsonic password. Please find your new login details below.\n\n" + "Username: " + username + "\n" + "Password: " + password + "\n\n" + "--\n" + - "Your Libresonic server\n" + - "libresonic.org"); + "Your Airsonic server\n" + + "airsonic.org"); message.setSentDate(new Date()); Transport trans = session.getTransport(prot); diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ReloadFrame.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ReloadFrame.java index 1c321fb1..65a78567 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ReloadFrame.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ReloadFrame.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; /** - * Used in libresonic-servlet.xml to specify frame reloading. + * Used in servlet.xml to specify frame reloading. * * @author Sindre Mehus */ diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java index 9d9e7b1a..a5ece7eb 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.VersionService; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.VersionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SearchController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SearchController.java index 7ce122f7..091f6cbc 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SearchController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SearchController.java @@ -1,31 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.command.SearchCommand; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SearchService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.command.SearchCommand; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SearchService; -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.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SetMusicFileInfoController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SetMusicFileInfoController.java index 5a54e271..6947519e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SetMusicFileInfoController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SetMusicFileInfoController.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SetRatingController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SetRatingController.java index 9ac974cc..80e0a0e2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SetRatingController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SetRatingController.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.RatingService; -import org.libresonic.player.service.SecurityService; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.RatingService; +import org.airsonic.player.service.SecurityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java index 80a024d6..f6b94efc 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.SecurityService; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.SecurityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java index 1cb39782..ab1fab6d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.PlayQueue; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.Share; -import org.libresonic.player.service.*; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.PlayQueue; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.Share; +import org.airsonic.player.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestBindingException; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ShareSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareSettingsController.java index 365b9d46..80be98e3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ShareSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareSettingsController.java @@ -1,33 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.Share; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.ShareService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.Share; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.ShareService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SonosSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SonosSettingsController.java index c52e399d..bb0c78dd 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SonosSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SonosSettingsController.java @@ -1,27 +1,27 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.service.NetworkService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.SonosService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.service.NetworkService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.SonosService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -74,7 +74,7 @@ public class SonosSettingsController { boolean sonosEnabled = ServletRequestUtils.getBooleanParameter(request, "sonosEnabled", false); String sonosServiceName = StringUtils.trimToNull(request.getParameter("sonosServiceName")); if (sonosServiceName == null) { - sonosServiceName = "Libresonic"; + sonosServiceName = "Airsonic"; } settingsService.setSonosEnabled(sonosEnabled); diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/StarredController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StarredController.java index 40f3d296..9dc420f2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/StarredController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/StarredController.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/StatusChartController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StatusChartController.java index e862eb83..221c93d7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/StatusChartController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/StatusChartController.java @@ -1,24 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.TransferStatus; +import org.airsonic.player.service.StatusService; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; @@ -28,8 +30,6 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.chart.renderer.xy.XYItemRenderer; import org.jfree.data.Range; import org.jfree.data.time.*; -import org.libresonic.player.domain.TransferStatus; -import org.libresonic.player.service.StatusService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/StatusController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StatusController.java index 0f6827fb..97325e95 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/StatusController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/StatusController.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.TransferStatus; -import org.libresonic.player.service.StatusService; -import org.libresonic.player.util.FileUtil; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.TransferStatus; +import org.airsonic.player.service.StatusService; +import org.airsonic.player.util.FileUtil; +import org.airsonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java index e33bb67c..1774b895 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java @@ -1,35 +1,35 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.domain.*; +import org.airsonic.player.io.PlayQueueInputStream; +import org.airsonic.player.io.RangeOutputStream; +import org.airsonic.player.io.ShoutCastOutputStream; +import org.airsonic.player.security.JWTAuthenticationToken; +import org.airsonic.player.service.*; +import org.airsonic.player.service.sonos.SonosHelper; +import org.airsonic.player.util.HttpRange; +import org.airsonic.player.util.StringUtil; +import org.airsonic.player.util.Util; import org.apache.commons.io.IOUtils; -import org.libresonic.player.domain.*; -import org.libresonic.player.io.PlayQueueInputStream; -import org.libresonic.player.io.RangeOutputStream; -import org.libresonic.player.io.ShoutCastOutputStream; -import org.libresonic.player.security.JWTAuthenticationToken; -import org.libresonic.player.service.*; -import org.libresonic.player.service.sonos.SonosHelper; -import org.libresonic.player.util.HttpRange; -import org.libresonic.player.util.StringUtil; -import org.libresonic.player.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +53,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * A controller which streams the content of a {@link org.libresonic.player.domain.PlayQueue} to a remote + * A controller which streams the content of a {@link PlayQueue} to a remote * {@link Player}. * * @author Sindre Mehus @@ -178,7 +178,7 @@ public class StreamController { response.setContentType(StringUtil.getMimeType("ts")); // HLS is always MPEG TS. } else { String transcodedSuffix = transcodingService.getSuffix(player, file, preferredTargetFormat); - boolean sonos = SonosHelper.LIBRESONIC_CLIENT_ID.equals(player.getClientId()); + boolean sonos = SonosHelper.AIRSONIC_CLIENT_ID.equals(player.getClientId()); response.setContentType(StringUtil.getMimeType(transcodedSuffix, sonos)); setContentDuration(response, file); } @@ -211,11 +211,11 @@ public class StreamController { boolean isShoutCastRequested = "1".equals(request.getHeader("icy-metadata")); if (isShoutCastRequested && !isSingleFile) { response.setHeader("icy-metaint", "" + ShoutCastOutputStream.META_DATA_INTERVAL); - response.setHeader("icy-notice1", "This stream is served using Libresonic"); - response.setHeader("icy-notice2", "Libresonic - Free media streamer - libresonic.org"); - response.setHeader("icy-name", "Libresonic"); + response.setHeader("icy-notice1", "This stream is served using Airsonic"); + response.setHeader("icy-notice2", "Airsonic - Free media streamer - airsonic.org"); + response.setHeader("icy-name", "Airsonic"); response.setHeader("icy-genre", "Mixed"); - response.setHeader("icy-url", "http://libresonic.org/"); + response.setHeader("icy-url", "http://airsonic.org/"); out = new ShoutCastOutputStream(out, player.getPlayQueue(), settingsService); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/TestController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/TestController.java index f9596ad7..f1479c38 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/TestController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/TestController.java @@ -1,4 +1,4 @@ -package org.libresonic.player.controller; +package org.airsonic.player.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/TopController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/TopController.java index 4806ffa9..5991020d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/TopController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/TopController.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.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.airsonic.player.domain.AvatarScheme; +import org.airsonic.player.domain.User; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java index 299c1a23..99916c68 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.Transcoding; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.TranscodingService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.Transcoding; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.TranscodingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/UploadController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UploadController.java index fa9003c5..eac94260 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/UploadController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/UploadController.java @@ -1,39 +1,39 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.domain.TransferStatus; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.StatusService; +import org.airsonic.player.upload.MonitoredDiskFileItemFactory; +import org.airsonic.player.upload.UploadListener; +import org.airsonic.player.util.StringUtil; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.io.IOUtils; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipFile; -import org.libresonic.player.domain.TransferStatus; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.StatusService; -import org.libresonic.player.upload.MonitoredDiskFileItemFactory; -import org.libresonic.player.upload.UploadListener; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/UserChartController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UserChartController.java index 53868515..16128c97 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/UserChartController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/UserChartController.java @@ -1,24 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; +package org.airsonic.player.controller; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.SecurityService; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; @@ -31,8 +33,6 @@ import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.renderer.category.BarRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.data.category.DefaultCategoryDataset; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.SecurityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java index 1741550d..6970f2e9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java @@ -1,35 +1,35 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - +package org.airsonic.player.controller; + +import org.airsonic.player.command.UserSettingsCommand; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.TranscodeScheme; +import org.airsonic.player.domain.User; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.TranscodingService; +import org.airsonic.player.util.Util; +import org.airsonic.player.validator.UserSettingsValidator; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.command.UserSettingsCommand; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.TranscodeScheme; -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.libresonic.player.service.TranscodingService; -import org.libresonic.player.util.Util; -import org.libresonic.player.validator.UserSettingsValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java index fe8072af..263334e5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java @@ -1,28 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.controller; - -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.*; -import org.libresonic.player.util.StringUtil; +package org.airsonic.player.controller; + +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.NetworkService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.ServletRequestUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java index 89464eea..987a3a09 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java index e582d45b..510bc88a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; +import org.airsonic.player.domain.Album; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.util.FileUtil; import org.apache.commons.lang.ObjectUtils; -import org.libresonic.player.domain.Album; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.util.FileUtil; import org.springframework.jdbc.core.RowMapper; import org.springframework.transaction.annotation.Transactional; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/ArtistDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/ArtistDao.java index 1de26f78..9e46231f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/ArtistDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/ArtistDao.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.Artist; -import org.libresonic.player.domain.MusicFolder; +import org.airsonic.player.domain.Artist; +import org.airsonic.player.domain.MusicFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/AvatarDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AvatarDao.java index 45c2ebc9..b55d5db3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/AvatarDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/AvatarDao.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.Avatar; +import org.airsonic.player.domain.Avatar; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/BookmarkDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/BookmarkDao.java index b006b609..6466f27b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/BookmarkDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/BookmarkDao.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.Bookmark; +import org.airsonic.player.domain.Bookmark; import org.springframework.jdbc.core.RowMapper; import org.springframework.transaction.annotation.Transactional; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/DaoHelper.java b/airsonic-main/src/main/java/org/airsonic/player/dao/DaoHelper.java index a9015b48..a0e5b4b8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/DaoHelper.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/DaoHelper.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/GenericDaoHelper.java b/airsonic-main/src/main/java/org/airsonic/player/dao/GenericDaoHelper.java index ad7903d5..792df5e0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/GenericDaoHelper.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/GenericDaoHelper.java @@ -1,4 +1,4 @@ -package org.libresonic.player.dao; +package org.airsonic.player.dao; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/InternetRadioDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/InternetRadioDao.java index 9a1d0f9c..d66b1a1d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/InternetRadioDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/InternetRadioDao.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.InternetRadio; +import org.airsonic.player.domain.InternetRadio; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/MediaFileDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/MediaFileDao.java index 8759d007..81e4be6d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/MediaFileDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/MediaFileDao.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; +import org.airsonic.player.domain.Genre; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.RandomSearchCriteria; +import org.airsonic.player.util.Util; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.Genre; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.RandomSearchCriteria; -import org.libresonic.player.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; @@ -34,9 +34,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; -import static org.libresonic.player.domain.MediaFile.MediaType; -import static org.libresonic.player.domain.MediaFile.MediaType.*; - /** * Provides database services for media files. * @@ -97,7 +94,7 @@ public class MediaFileDao extends AbstractDao { public List getSongsForAlbum(String artist, String album) { return query("select " + QUERY_COLUMNS + " from media_file where album_artist=? and album=? and present " + "and type in (?,?,?) order by disc_number, track_number", rowMapper, - artist, album, MUSIC.name(), AUDIOBOOK.name(), PODCAST.name()); + artist, album, MediaFile.MediaType.MUSIC.name(), MediaFile.MediaType.AUDIOBOOK.name(), MediaFile.MediaType.PODCAST.name()); } public List getVideos(final int count, final int offset, final List musicFolders) { @@ -105,7 +102,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", VIDEO.name()); + put("type", MediaFile.MediaType.VIDEO.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("count", count); put("offset", offset); @@ -120,7 +117,7 @@ public class MediaFileDao extends AbstractDao { return null; } Map args = new HashMap() {{ - put("type", DIRECTORY.name()); + put("type", MediaFile.MediaType.DIRECTORY.name()); put("name", name); put("folders", MusicFolder.toPathList(musicFolders)); }}; @@ -232,7 +229,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("count", count); put("offset", offset); @@ -256,7 +253,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("count", count); put("offset", offset); @@ -279,7 +276,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("count", count); put("offset", offset); @@ -304,7 +301,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("count", count); put("offset", offset); @@ -332,7 +329,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("fromYear", fromYear); put("toYear", toYear); @@ -368,7 +365,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("genre", genre); put("folders", MusicFolder.toPathList(musicFolders)); put("count", count); @@ -383,7 +380,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("types", Arrays.asList(MUSIC.name(), PODCAST.name(), AUDIOBOOK.name())); + put("types", Arrays.asList(MediaFile.MediaType.MUSIC.name(), MediaFile.MediaType.PODCAST.name(), MediaFile.MediaType.AUDIOBOOK.name())); put("genre", genre); put("count", count); put("offset", offset); @@ -397,7 +394,7 @@ public class MediaFileDao extends AbstractDao { public List getSongsByArtist(String artist, int offset, int count) { return query("select " + QUERY_COLUMNS + " from media_file where type in (?,?,?) and artist=? and present limit ? offset ?", - rowMapper, MUSIC.name(), PODCAST.name(), AUDIOBOOK.name(), artist, count, offset); + rowMapper, MediaFile.MediaType.MUSIC.name(), MediaFile.MediaType.PODCAST.name(), MediaFile.MediaType.AUDIOBOOK.name(), artist, count, offset); } public MediaFile getSongByArtistAndTitle(final String artist, final String title, final List musicFolders) { @@ -407,7 +404,7 @@ public class MediaFileDao extends AbstractDao { Map args = new HashMap() {{ put("artist", artist); put("title", title); - put("type", MUSIC.name()); + put("type", MediaFile.MediaType.MUSIC.name()); put("folders", MusicFolder.toPathList(musicFolders)); }}; return namedQueryOne("select " + QUERY_COLUMNS + " from media_file where artist = :artist " + @@ -430,7 +427,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("username", username); put("count", count); @@ -457,7 +454,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("type", DIRECTORY.name()); + put("type", MediaFile.MediaType.DIRECTORY.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("username", username); put("count", count); @@ -486,7 +483,7 @@ public class MediaFileDao extends AbstractDao { return Collections.emptyList(); } Map args = new HashMap() {{ - put("types", Arrays.asList(MUSIC.name(), PODCAST.name(), AUDIOBOOK.name(), VIDEO.name())); + put("types", Arrays.asList(MediaFile.MediaType.MUSIC.name(), MediaFile.MediaType.PODCAST.name(), MediaFile.MediaType.AUDIOBOOK.name(), MediaFile.MediaType.VIDEO.name())); put("folders", MusicFolder.toPathList(musicFolders)); put("username", username); put("count", count); @@ -611,7 +608,7 @@ public class MediaFileDao extends AbstractDao { return 0; } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); }}; return namedQueryForInt("select count(*) from media_file where type = :type and folder in (:folders) and present", 0, args); @@ -622,7 +619,7 @@ public class MediaFileDao extends AbstractDao { return 0; } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); }}; return namedQueryForInt("select count(*) from media_file where type = :type " + @@ -634,7 +631,7 @@ public class MediaFileDao extends AbstractDao { return 0; } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("username", username); }}; @@ -692,7 +689,7 @@ public class MediaFileDao extends AbstractDao { rs.getInt(1), rs.getString(2), rs.getString(3), - MediaType.valueOf(rs.getString(4)), + MediaFile.MediaType.valueOf(rs.getString(4)), rs.getString(5), rs.getString(6), rs.getString(7), diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/MusicFolderDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/MusicFolderDao.java index 7e5bff04..30580588 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/MusicFolderDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/MusicFolderDao.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.MusicFolder; +import org.airsonic.player.domain.MusicFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/PlayQueueDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PlayQueueDao.java index 8642fe94..0a6d8f0b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/PlayQueueDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/PlayQueueDao.java @@ -1,24 +1,24 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.SavedPlayQueue; +import org.airsonic.player.domain.SavedPlayQueue; import org.springframework.jdbc.core.RowMapper; import org.springframework.transaction.annotation.Transactional; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java index 732b4102..22fa54f6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.*; +import org.airsonic.player.domain.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; @@ -59,7 +59,7 @@ public class PlayerDao extends AbstractDao { * * @param username The name of the user. * @param clientId The third-party client ID (used if this player is managed over the - * Libresonic REST API). May be null. + * Airsonic REST API). May be null. * @return All relevant players. */ public List getPlayersForUserAndClientId(String username, String clientId) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/PlaylistDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PlaylistDao.java index 342a4a10..c0a92c6e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/PlaylistDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/PlaylistDao.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Playlist; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Playlist; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/PodcastDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PodcastDao.java index 6f7b6168..20ef2a2c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/PodcastDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/PodcastDao.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.PodcastChannel; -import org.libresonic.player.domain.PodcastEpisode; -import org.libresonic.player.domain.PodcastStatus; +import org.airsonic.player.domain.PodcastChannel; +import org.airsonic.player.domain.PodcastEpisode; +import org.airsonic.player.domain.PodcastStatus; import org.springframework.jdbc.core.RowMapper; import org.springframework.transaction.annotation.Transactional; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/RatingDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/RatingDao.java index aa050967..fdecc099 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/RatingDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/RatingDao.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; import org.springframework.dao.EmptyResultDataAccessException; import java.util.Collections; @@ -28,8 +28,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.libresonic.player.domain.MediaFile.MediaType.ALBUM; - /** * Provides database services for ratings. * @@ -51,7 +49,7 @@ public class RatingDao extends AbstractDao { } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("count", count); put("offset", offset); @@ -116,7 +114,7 @@ public class RatingDao extends AbstractDao { return 0; } Map args = new HashMap() {{ - put("type", ALBUM.name()); + put("type", MediaFile.MediaType.ALBUM.name()); put("folders", MusicFolder.toPathList(musicFolders)); put("username", username); }}; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/ShareDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/ShareDao.java index 0e7a12b6..8ba08bba 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/ShareDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/ShareDao.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.Share; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.Share; import org.springframework.jdbc.core.RowMapper; import org.springframework.transaction.annotation.Transactional; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/TranscodingDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/TranscodingDao.java index dc4e26f2..db0fbe86 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/TranscodingDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/TranscodingDao.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.Transcoding; +import org.airsonic.player.domain.Transcoding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java index 7703f664..3d459106 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.dao; +package org.airsonic.player.dao; -import org.libresonic.player.domain.*; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.domain.*; +import org.airsonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.RowMapper; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Album.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Album.java index c7cec5cf..33723264 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Album.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Album.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumListType.java b/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumListType.java index 5356da01..17ef8d93 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumListType.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumListType.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * @author Sindre Mehus diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumNotes.java b/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumNotes.java index d3d48237..ad2320a3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumNotes.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumNotes.java @@ -1,24 +1,24 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * - * Copyright 2016 (C) Libresonic Authors + * Copyright 2016 (C) Airsonic Authors * Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * @author Sindre Mehus diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Artist.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Artist.java index c2984e40..bdcc942e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Artist.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Artist.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/ArtistBio.java b/airsonic-main/src/main/java/org/airsonic/player/domain/ArtistBio.java index f12af5cf..427c45f1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/ArtistBio.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/ArtistBio.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2014 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * @author Sindre Mehus diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Avatar.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Avatar.java index 320a9e5c..b14df16d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Avatar.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Avatar.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/AvatarScheme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/AvatarScheme.java index a39da8f0..ed84e490 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/AvatarScheme.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/AvatarScheme.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Enumeration of avatar schemes. diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Bookmark.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Bookmark.java index 28b709e3..07dcefec 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Bookmark.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Bookmark.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/CacheElement.java b/airsonic-main/src/main/java/org/airsonic/player/domain/CacheElement.java index bc5e36e9..4f1244c0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/CacheElement.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/CacheElement.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * @author Sindre Mehus diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/CoverArtScheme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/CoverArtScheme.java index 9dc97959..1281ccdf 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/CoverArtScheme.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/CoverArtScheme.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Enumeration of cover art schemes. Each value contains a size, which indicates how big the diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Genre.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Genre.java index b37cd6cb..05f5222c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Genre.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Genre.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Represents a musical genre. diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Genres.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Genres.java index fcf505e0..eb14368f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Genres.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Genres.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.ArrayList; import java.util.HashMap; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/InternetRadio.java b/airsonic-main/src/main/java/org/airsonic/player/domain/InternetRadio.java index 886d94b8..ed013ca7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/InternetRadio.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/InternetRadio.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/LastFmCoverArt.java b/airsonic-main/src/main/java/org/airsonic/player/domain/LastFmCoverArt.java index d328113a..c72586e8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/LastFmCoverArt.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/LastFmCoverArt.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2014 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * @author Sindre Mehus diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFile.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFile.java index eb74cd0f..b026da93 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFile.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFile.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import com.google.common.base.Function; import com.google.common.collect.Lists; +import org.airsonic.player.util.FileUtil; import org.apache.commons.io.FilenameUtils; -import org.libresonic.player.util.FileUtil; import java.io.File; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java index 4b5500c8..a6e203c9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java @@ -1,28 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Comparator; -import static org.libresonic.player.domain.MediaFile.MediaType.DIRECTORY; - /** * Comparator for sorting media files. */ @@ -45,10 +43,10 @@ public class MediaFileComparator implements Comparator { } // Non-album directories before album directories. - if (a.isAlbum() && b.getMediaType() == DIRECTORY) { + if (a.isAlbum() && b.getMediaType() == MediaFile.MediaType.DIRECTORY) { return 1; } - if (a.getMediaType() == DIRECTORY && b.isAlbum()) { + if (a.getMediaType() == MediaFile.MediaType.DIRECTORY && b.isAlbum()) { return -1; } diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileWithUrlInfo.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileWithUrlInfo.java index 356514f3..aa874615 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileWithUrlInfo.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileWithUrlInfo.java @@ -1,4 +1,4 @@ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import com.google.common.base.Function; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaLibraryStatistics.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaLibraryStatistics.java index 93fa9b1e..584e3eb7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaLibraryStatistics.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaLibraryStatistics.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolder.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolder.java index 1d7df092..d8640444 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolder.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolder.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import com.google.common.base.Function; import com.google.common.base.Objects; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolderContent.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolderContent.java index a0d80cd1..8183e763 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolderContent.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolderContent.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.List; import java.util.SortedMap; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MusicIndex.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicIndex.java index 4f0c5bf7..93f388e1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MusicIndex.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicIndex.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.io.Serializable; import java.text.CollationKey; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/ParamSearchResult.java b/airsonic-main/src/main/java/org/airsonic/player/domain/ParamSearchResult.java index 91c44ecb..8744669b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/ParamSearchResult.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/ParamSearchResult.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; -import org.libresonic.player.service.SearchService; +import org.airsonic.player.service.SearchService; import java.util.ArrayList; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java index be680775..3a1796d0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import org.apache.commons.lang.StringUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayStatus.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayStatus.java index 28c5e54a..f242cb14 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayStatus.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayStatus.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Player.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Player.java index 9ef3fa38..ce544595 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Player.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Player.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import org.apache.commons.lang.StringUtils; @@ -92,7 +92,7 @@ public class Player { /** * Returns the third-party client ID (used if this player is managed over the - * Libresonic REST API). + * Airsonic REST API). * * @return The client ID. */ @@ -102,7 +102,7 @@ public class Player { /** * Sets the third-party client ID (used if this player is managed over the - * Libresonic REST API). + * Airsonic REST API). * * @param clientId The client ID. */ diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayerTechnology.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayerTechnology.java index 8562e4a9..cc82ce28 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayerTechnology.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayerTechnology.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Enumeration of player technologies. @@ -37,13 +37,13 @@ public enum PlayerTechnology { EXTERNAL, /** - * Same as above, but the playlist is managed by the player, rather than the Libresonic server. + * Same as above, but the playlist is managed by the player, rather than the Airsonic server. * In this mode, skipping within songs is possible. */ EXTERNAL_WITH_PLAYLIST, /** - * Plays music directly on the audio device of the Libresonic server. + * Plays music directly on the audio device of the Airsonic server. */ JUKEBOX diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java index 214a1f79..22666fc1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.util.StringUtil; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannel.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannel.java index 2b0045be..95793d8d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannel.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannel.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * A Podcast channel. Each channel contain several episodes. diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastEpisode.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastEpisode.java index 869e75c3..fb94a5db 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastEpisode.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastEpisode.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastStatus.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastStatus.java index e8deeec4..7a4b6370 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastStatus.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastStatus.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Enumeration of statuses for {@link PodcastChannel} and diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/RandomSearchCriteria.java b/airsonic-main/src/main/java/org/airsonic/player/domain/RandomSearchCriteria.java index 535cbe8d..45bc5b69 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/RandomSearchCriteria.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/RandomSearchCriteria.java @@ -1,23 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; + +import org.airsonic.player.service.SearchService; import java.util.Date; import java.util.List; @@ -26,7 +28,7 @@ import java.util.List; * Defines criteria used when generating random playlists. * * @author Sindre Mehus - * @see org.libresonic.player.service.SearchService#getRandomSongs + * @see SearchService#getRandomSongs */ public class RandomSearchCriteria { diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/SavedPlayQueue.java b/airsonic-main/src/main/java/org/airsonic/player/domain/SavedPlayQueue.java index 1e4a3ce1..5076fbd3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/SavedPlayQueue.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/SavedPlayQueue.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/SearchCriteria.java b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchCriteria.java index dfa300ee..67cb9d4f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/SearchCriteria.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchCriteria.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; -import org.libresonic.player.service.SearchService; +import org.airsonic.player.service.SearchService; /** * Defines criteria used when searching. diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java index 1689599f..52bd5fc0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; -import org.libresonic.player.service.SearchService; +import org.airsonic.player.service.SearchService; import java.util.ArrayList; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Share.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Share.java index 161a7862..afc619a2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Share.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Share.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Theme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Theme.java index 795cfe5e..64d8d61d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Theme.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Theme.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Contains the ID and name for a theme. diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/TranscodeScheme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/TranscodeScheme.java index 1c5b75f1..7ebb85b2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/TranscodeScheme.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/TranscodeScheme.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Enumeration of transcoding schemes. Transcoding is the process of diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Transcoding.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Transcoding.java index 8cd95def..c49c79b4 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Transcoding.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Transcoding.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.util.StringUtil; /** * Contains the configuration for a transcoding, i.e., a specification of how a given media format diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/TransferStatus.java b/airsonic-main/src/main/java/org/airsonic/player/domain/TransferStatus.java index b4c78a1e..dfce8386 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/TransferStatus.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/TransferStatus.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; -import org.libresonic.player.util.BoundedList; +import org.airsonic.player.util.BoundedList; import java.io.File; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/User.java b/airsonic-main/src/main/java/org/airsonic/player/domain/User.java index 1c4dba82..94971221 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/User.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/User.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Represent a user. diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/UserSettings.java b/airsonic-main/src/main/java/org/airsonic/player/domain/UserSettings.java index 6aeaec6f..6e42115b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/UserSettings.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/UserSettings.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import java.util.Date; import java.util.Locale; diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Version.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Version.java index 9736c8e3..797944e1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/Version.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/Version.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; /** - * Represents the version number of Libresonic. + * Represents the version number of Airsonic. * * @author Sindre Mehus * @version $Revision: 1.3 $ $Date: 2006/01/20 21:25:16 $ diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/VideoTranscodingSettings.java b/airsonic-main/src/main/java/org/airsonic/player/domain/VideoTranscodingSettings.java index 163d7bfd..bea51610 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/VideoTranscodingSettings.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/VideoTranscodingSettings.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.domain; +package org.airsonic.player.domain; /** * Parameters used when transcoding videos. diff --git a/airsonic-main/src/main/java/org/airsonic/player/filter/BootstrapVerificationFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/BootstrapVerificationFilter.java index 6f15acb9..7335a3c7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/filter/BootstrapVerificationFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/filter/BootstrapVerificationFilter.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.filter; +package org.airsonic.player.filter; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,10 +32,10 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * This filter is executed very early in the filter chain. It verifies that - * the Libresonic home directory (c:\libresonic or /var/libresonic) exists and + * the Airsonic home directory (c:\airsonic or /var/airsonic) exists and * is writable. If not, a proper error message is given to the user. *

- * (The Libresonic home directory is usually created automatically, but a common + * (The Airsonic home directory is usually created automatically, but a common * problem on Linux is that the Tomcat user does not have the necessary * privileges). * @@ -44,33 +44,33 @@ import java.util.concurrent.atomic.AtomicBoolean; public class BootstrapVerificationFilter implements Filter { private static final Logger LOG = LoggerFactory.getLogger(BootstrapVerificationFilter.class); - private boolean libresonicHomeVerified = false; + private boolean airsonicHomeVerified = false; private final AtomicBoolean serverInfoLogged = new AtomicBoolean(); public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { // Already verified? - if (libresonicHomeVerified) { + if (airsonicHomeVerified) { chain.doFilter(req, res); return; } - File home = SettingsService.getLibresonicHome(); + File home = SettingsService.getAirsonicHome(); if (!directoryExists(home)) { error(res, "

The directory " + home + " does not exist. Please create it and make it writable, " + "then restart the servlet container.

" + - "

(You can override the directory location by specifying -Dlibresonic.home=... when " + + "

(You can override the directory location by specifying -Dairsonic.home=... when " + "starting the servlet container.)

"); } else if (!directoryWritable(home)) { error(res, "

The directory " + home + " is not writable. Please change file permissions, " + "then restart the servlet container.

" + - "

(You can override the directory location by specifying -Dlibresonic.home=... when " + + "

(You can override the directory location by specifying -Dairsonic.home=... when " + "starting the servlet container.)

"); } else { - libresonicHomeVerified = true; + airsonicHomeVerified = true; logServerInfo(req); chain.doFilter(req, res); } @@ -100,9 +100,9 @@ public class BootstrapVerificationFilter implements Filter { private void error(ServletResponse res, String error) throws IOException { ServletOutputStream out = res.getOutputStream(); out.println("" + - "Libresonic Error" + + "Airsonic Error" + "" + - "

Libresonic Error

" + + "

Airsonic Error

" + error + "" + ""); diff --git a/airsonic-main/src/main/java/org/airsonic/player/filter/MetricsFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/MetricsFilter.java index 18e886f8..3b877d14 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/filter/MetricsFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/filter/MetricsFilter.java @@ -1,6 +1,6 @@ -package org.libresonic.player.filter; +package org.airsonic.player.filter; -import org.libresonic.player.monitor.MetricsManager; +import org.airsonic.player.monitor.MetricsManager; import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.*; diff --git a/airsonic-main/src/main/java/org/airsonic/player/filter/ParameterDecodingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/ParameterDecodingFilter.java index c5db6bab..ca2e87a3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/filter/ParameterDecodingFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/filter/ParameterDecodingFilter.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.filter; +package org.airsonic.player.filter; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/filter/RESTFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/RESTFilter.java index f36d999d..af3f89d5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/filter/RESTFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/filter/RESTFilter.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.filter; +package org.airsonic.player.filter; -import org.libresonic.player.controller.JAXBWriter; -import org.libresonic.player.controller.RESTController; +import org.airsonic.player.controller.JAXBWriter; +import org.airsonic.player.controller.RESTController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.ServletRequestBindingException; @@ -32,9 +32,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import static org.libresonic.player.controller.RESTController.ErrorCode.GENERIC; -import static org.libresonic.player.controller.RESTController.ErrorCode.MISSING_PARAMETER; - /** * Intercepts exceptions thrown by RESTController. * @@ -64,7 +61,7 @@ public class RESTFilter implements Filter { x = x.getCause(); } - RESTController.ErrorCode code = (x instanceof ServletRequestBindingException) ? MISSING_PARAMETER : GENERIC; + RESTController.ErrorCode code = (x instanceof ServletRequestBindingException) ? RESTController.ErrorCode.MISSING_PARAMETER : RESTController.ErrorCode.GENERIC; String msg = getErrorMessage(x); LOG.warn("Error in REST API: " + msg, x); diff --git a/airsonic-main/src/main/java/org/airsonic/player/filter/RequestEncodingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/RequestEncodingFilter.java index eb062bb0..10bb3636 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/filter/RequestEncodingFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/filter/RequestEncodingFilter.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.filter; +package org.airsonic.player.filter; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; diff --git a/airsonic-main/src/main/java/org/airsonic/player/filter/ResponseHeaderFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/ResponseHeaderFilter.java index 80a5ee44..a4a9ab7f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/filter/ResponseHeaderFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/filter/ResponseHeaderFilter.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.filter; +package org.airsonic.player.filter; import javax.servlet.*; import javax.servlet.http.HttpServletResponse; diff --git a/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java b/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java index 2eaa3aa1..d7d98724 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java +++ b/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java @@ -1,28 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.i18n; +package org.airsonic.player.i18n; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; -import org.springframework.web.servlet.LocaleResolver; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -37,7 +36,7 @@ import java.util.Set; * * @author Sindre Mehus */ -public class LibresonicLocaleResolver implements LocaleResolver { +public class LocaleResolver implements org.springframework.web.servlet.LocaleResolver { private SecurityService securityService; private SettingsService settingsService; @@ -50,14 +49,14 @@ public class LibresonicLocaleResolver implements LocaleResolver { * @return The current locale. */ public Locale resolveLocale(HttpServletRequest request) { - Locale locale = (Locale) request.getAttribute("libresonic.locale"); + Locale locale = (Locale) request.getAttribute("airsonic.locale"); if (locale != null) { return locale; } // Optimization: Cache locale in the request. locale = doResolveLocale(request); - request.setAttribute("libresonic.locale", locale); + request.setAttribute("airsonic.locale", locale); return locale; } diff --git a/airsonic-main/src/main/java/org/airsonic/player/io/InputStreamReaderThread.java b/airsonic-main/src/main/java/org/airsonic/player/io/InputStreamReaderThread.java index ba1bffd7..fab66006 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/io/InputStreamReaderThread.java +++ b/airsonic-main/src/main/java/org/airsonic/player/io/InputStreamReaderThread.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.io; +package org.airsonic.player.io; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/airsonic-main/src/main/java/org/airsonic/player/io/PlayQueueInputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/PlayQueueInputStream.java index e16f582a..b48f1e14 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/io/PlayQueueInputStream.java +++ b/airsonic-main/src/main/java/org/airsonic/player/io/PlayQueueInputStream.java @@ -1,31 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.io; - -import org.libresonic.player.domain.*; -import org.libresonic.player.service.AudioScrobblerService; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.SearchService; -import org.libresonic.player.service.TranscodingService; -import org.libresonic.player.service.sonos.SonosHelper; -import org.libresonic.player.util.FileUtil; +package org.airsonic.player.io; + +import org.airsonic.player.domain.*; +import org.airsonic.player.service.AudioScrobblerService; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.SearchService; +import org.airsonic.player.service.TranscodingService; +import org.airsonic.player.service.sonos.SonosHelper; +import org.airsonic.player.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import java.io.InputStream; import java.util.List; /** - * Implementation of {@link InputStream} which reads from a {@link org.libresonic.player.domain.PlayQueue}. + * Implementation of {@link InputStream} which reads from a {@link PlayQueue}. * * @author Sindre Mehus */ @@ -121,7 +121,7 @@ public class PlayQueueInputStream extends InputStream { mediaFileService.incrementPlayCount(file); // Don't scrobble REST players (except Sonos) - if (player.getClientId() == null || player.getClientId().equals(SonosHelper.LIBRESONIC_CLIENT_ID)) { + if (player.getClientId() == null || player.getClientId().equals(SonosHelper.AIRSONIC_CLIENT_ID)) { audioScrobblerService.register(file, player.getUsername(), false, null); } @@ -146,7 +146,7 @@ public class PlayQueueInputStream extends InputStream { } } finally { // Don't scrobble REST players (except Sonos) - if (player.getClientId() == null || player.getClientId().equals(SonosHelper.LIBRESONIC_CLIENT_ID)) { + if (player.getClientId() == null || player.getClientId().equals(SonosHelper.AIRSONIC_CLIENT_ID)) { audioScrobblerService.register(currentFile, player.getUsername(), true, null); } currentInputStream = null; diff --git a/airsonic-main/src/main/java/org/airsonic/player/io/RangeOutputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/RangeOutputStream.java index 59462a24..8c9c6ee6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/io/RangeOutputStream.java +++ b/airsonic-main/src/main/java/org/airsonic/player/io/RangeOutputStream.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.io; +package org.airsonic.player.io; -import org.libresonic.player.util.HttpRange; +import org.airsonic.player.util.HttpRange; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java index d8e18b06..5a031d09 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java +++ b/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.io; +package org.airsonic.player.io; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.PlayQueue; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.PlayQueue; -import org.libresonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/io/TranscodeInputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/TranscodeInputStream.java index 1c999e3d..9c2302e7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/io/TranscodeInputStream.java +++ b/airsonic-main/src/main/java/org/airsonic/player/io/TranscodeInputStream.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.io; +package org.airsonic.player.io; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java b/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java index 31c5f8fb..dc452b89 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java +++ b/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java @@ -1,8 +1,8 @@ -package org.libresonic.player.monitor; +package org.airsonic.player.monitor; import com.codahale.metrics.JmxReporter; import com.codahale.metrics.MetricRegistry; -import org.libresonic.player.service.ApacheCommonsConfigurationService; +import org.airsonic.player.service.ApacheCommonsConfigurationService; import java.util.concurrent.TimeUnit; diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/CsrfSecurityRequestMatcher.java b/airsonic-main/src/main/java/org/airsonic/player/security/CsrfSecurityRequestMatcher.java index f5284f5c..262b1307 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/CsrfSecurityRequestMatcher.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/CsrfSecurityRequestMatcher.java @@ -1,4 +1,4 @@ -package org.libresonic.player.security; +package org.airsonic.player.security; import org.springframework.security.web.util.matcher.RegexRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/CustomUserDetailsContextMapper.java b/airsonic-main/src/main/java/org/airsonic/player/security/CustomUserDetailsContextMapper.java index a95c8f56..0272144e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/CustomUserDetailsContextMapper.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/CustomUserDetailsContextMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.libresonic.player.security; +package org.airsonic.player.security; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,11 +36,11 @@ import org.springframework.stereotype.Component; import java.util.Collection; @Component -public class LibresonicUserDetailsContextMapper implements UserDetailsContextMapper { +public class CustomUserDetailsContextMapper implements UserDetailsContextMapper { // ~ Instance fields // ================================================================================================ - private final Logger logger = LoggerFactory.getLogger(LibresonicUserDetailsContextMapper.class); + private final Logger logger = LoggerFactory.getLogger(CustomUserDetailsContextMapper.class); private String passwordAttributeName = "userPassword"; @Autowired @@ -58,7 +58,7 @@ public class LibresonicUserDetailsContextMapper implements UserDetailsContextMap logger.debug("Mapping user details from context with DN: " + dn); - // User must be defined in Libresonic, unless auto-shadowing is enabled. + // User must be defined in Airsonic, unless auto-shadowing is enabled. User user = securityService.getUserByName(username, false); if (user == null && !settingsService.isLdapAutoShadowing()) { throw new BadCredentialsException("User does not exist."); diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java b/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java index a296cf79..6cfb9c4e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java @@ -1,9 +1,9 @@ -package org.libresonic.player.security; +package org.airsonic.player.security; +import org.airsonic.player.service.JWTSecurityService; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang3.StringUtils; -import org.libresonic.player.service.JWTSecurityService; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +41,7 @@ public class GlobalSecurityConfig extends GlobalAuthenticationConfigurerAdapter SettingsService settingsService; @Autowired - LibresonicUserDetailsContextMapper libresonicUserDetailsContextMapper; + CustomUserDetailsContextMapper customUserDetailsContextMapper; @Autowired ApplicationEventPublisher eventPublisher; @@ -56,7 +56,7 @@ public class GlobalSecurityConfig extends GlobalAuthenticationConfigurerAdapter .url(settingsService.getLdapUrl()) .and() .userSearchFilter(settingsService.getLdapSearchFilter()) - .userDetailsContextMapper(libresonicUserDetailsContextMapper); + .userDetailsContextMapper(customUserDetailsContextMapper); } auth.userDetailsService(securityService); String jwtKey = settingsService.getJWTKey(); @@ -162,7 +162,7 @@ public class GlobalSecurityConfig extends GlobalAuthenticationConfigurerAdapter // see http://docs.spring.io/spring-security/site/docs/3.2.4.RELEASE/reference/htmlsingle/#csrf-logout .and().logout().logoutRequestMatcher(new AntPathRequestMatcher("/logout", "GET")).logoutSuccessUrl( "/login?logout") - .and().rememberMe().key("libresonic"); + .and().rememberMe().key("airsonic"); } } diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java index f422002d..762874be 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java @@ -1,11 +1,11 @@ -package org.libresonic.player.security; +package org.airsonic.player.security; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; import com.google.common.collect.MapDifference; import com.google.common.collect.Maps; +import org.airsonic.player.service.JWTSecurityService; import org.apache.commons.lang3.StringUtils; -import org.libresonic.player.service.JWTSecurityService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.AuthenticationProvider; diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationToken.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationToken.java index d321547f..2dcf77ee 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationToken.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationToken.java @@ -1,4 +1,4 @@ -package org.libresonic.player.security; +package org.airsonic.player.security; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java index 3489c885..76959432 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java @@ -1,6 +1,6 @@ -package org.libresonic.player.security; +package org.airsonic.player.security; -import org.libresonic.player.service.JWTSecurityService; +import org.airsonic.player.service.JWTSecurityService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.AuthenticationManager; diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/LoginFailureListener.java b/airsonic-main/src/main/java/org/airsonic/player/security/LoginFailureListener.java index 7358a304..599d0b77 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/LoginFailureListener.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/LoginFailureListener.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.security; +package org.airsonic.player.security; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/RESTRequestParameterProcessingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/security/RESTRequestParameterProcessingFilter.java index 6d043192..229867da 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/RESTRequestParameterProcessingFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/RESTRequestParameterProcessingFilter.java @@ -1,32 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.security; - +package org.airsonic.player.security; + +import org.airsonic.player.controller.JAXBWriter; +import org.airsonic.player.controller.RESTController; +import org.airsonic.player.domain.User; +import org.airsonic.player.domain.Version; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.util.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.controller.JAXBWriter; -import org.libresonic.player.controller.RESTController; -import org.libresonic.player.domain.User; -import org.libresonic.player.domain.Version; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/ApacheCommonsConfigurationService.java b/airsonic-main/src/main/java/org/airsonic/player/service/ApacheCommonsConfigurationService.java index 883674f7..7ae84e20 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/ApacheCommonsConfigurationService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/ApacheCommonsConfigurationService.java @@ -1,4 +1,4 @@ -package org.libresonic.player.service; +package org.airsonic.player.service; import org.apache.commons.configuration2.*; import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; @@ -21,7 +21,7 @@ public class ApacheCommonsConfigurationService { private final Configuration config; - public static final String HEADER_COMMENT = "Libresonic preferences. NOTE: This file is automatically generated." + public static final String HEADER_COMMENT = "Airsonic preferences. NOTE: This file is automatically generated." + " Do not modify while application is running"; public ApacheCommonsConfigurationService() { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/AudioScrobblerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/AudioScrobblerService.java index c3fbf0eb..f57f47e6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/AudioScrobblerService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/AudioScrobblerService.java @@ -1,24 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.util.StringUtil; import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.NameValuePair; import org.apache.http.client.ResponseHandler; @@ -31,9 +34,6 @@ import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/JWTSecurityService.java b/airsonic-main/src/main/java/org/airsonic/player/service/JWTSecurityService.java index e49dc9e2..dcbf4ce2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/JWTSecurityService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/JWTSecurityService.java @@ -1,4 +1,4 @@ -package org.libresonic.player.service; +package org.airsonic.player.service; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/JukeboxService.java b/airsonic-main/src/main/java/org/airsonic/player/service/JukeboxService.java index 7a9843f2..97951bf8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/JukeboxService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/JukeboxService.java @@ -1,35 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.jukebox.AudioPlayer; +import org.airsonic.player.util.FileUtil; import org.apache.commons.io.IOUtils; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.jukebox.AudioPlayer; -import org.libresonic.player.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.InputStream; -import static org.libresonic.player.service.jukebox.AudioPlayer.State.EOM; - /** * Plays music on the local audio device. * @@ -120,7 +118,7 @@ public class JukeboxService implements AudioPlayer.Listener { } public synchronized void stateChanged(AudioPlayer audioPlayer, AudioPlayer.State state) { - if (state == EOM) { + if (state == AudioPlayer.State.EOM) { player.getPlayQueue().next(); MediaFile result; synchronized (player.getPlayQueue()) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/LastFmCache.java b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmCache.java index a7e8f8e9..0e23d0bd 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/LastFmCache.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmCache.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2014 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import de.umass.lastfm.cache.Cache; import de.umass.lastfm.cache.ExpirationPolicy; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java index 72462e78..8d65e3c5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2014 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import com.google.common.base.Function; import com.google.common.base.Predicates; @@ -26,10 +26,10 @@ import com.google.common.collect.Lists; import de.umass.lastfm.*; import de.umass.lastfm.Album; import de.umass.lastfm.Artist; +import org.airsonic.player.dao.ArtistDao; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.*; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.dao.ArtistDao; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,9 +57,9 @@ public class LastFmService { public void init() { Caller caller = Caller.getInstance(); - caller.setUserAgent("Libresonic"); + caller.setUserAgent("Airsonic"); - File cacheDir = new File(SettingsService.getLibresonicHome(), "lastfmcache"); + File cacheDir = new File(SettingsService.getAirsonicHome(), "lastfmcache"); caller.setCache(new LastFmCache(cacheDir, CACHE_TIME_TO_LIVE_MILLIS)); } @@ -124,16 +124,16 @@ public class LastFmService { * @param musicFolders Only return songs from artists in these folders. * @return Similar artists, ordered by presence then similarity. */ - public List getSimilarArtists(org.libresonic.player.domain.Artist artist, - int count, boolean includeNotPresent, List musicFolders) { - List result = new ArrayList(); + public List getSimilarArtists(org.airsonic.player.domain.Artist artist, + int count, boolean includeNotPresent, List musicFolders) { + List result = new ArrayList(); try { // First select artists that are present. Collection similarArtists = Artist.getSimilar(getCanonicalArtistName(artist.getName()), LAST_FM_KEY); for (Artist lastFmArtist : similarArtists) { - org.libresonic.player.domain.Artist similarArtist = artistDao.getArtist(lastFmArtist.getName(), musicFolders); + org.airsonic.player.domain.Artist similarArtist = artistDao.getArtist(lastFmArtist.getName(), musicFolders); if (similarArtist != null) { result.add(similarArtist); if (result.size() == count) { @@ -145,9 +145,9 @@ public class LastFmService { // Then fill up with non-present artists if (includeNotPresent) { for (Artist lastFmArtist : similarArtists) { - org.libresonic.player.domain.Artist similarArtist = artistDao.getArtist(lastFmArtist.getName()); + org.airsonic.player.domain.Artist similarArtist = artistDao.getArtist(lastFmArtist.getName()); if (similarArtist == null) { - org.libresonic.player.domain.Artist notPresentArtist = new org.libresonic.player.domain.Artist(); + org.airsonic.player.domain.Artist notPresentArtist = new org.airsonic.player.domain.Artist(); notPresentArtist.setId(-1); notPresentArtist.setName(lastFmArtist.getName()); result.add(notPresentArtist); @@ -172,12 +172,12 @@ public class LastFmService { * @param musicFolders Only return songs from artists in these folders. * @return Songs from similar artists; */ - public List getSimilarSongs(org.libresonic.player.domain.Artist artist, int count, + public List getSimilarSongs(org.airsonic.player.domain.Artist artist, int count, List musicFolders) throws IOException { List similarSongs = new ArrayList(); similarSongs.addAll(mediaFileDao.getSongsByArtist(artist.getName(), 0, 1000)); - for (org.libresonic.player.domain.Artist similarArtist : getSimilarArtists(artist, 100, false, musicFolders)) { + for (org.airsonic.player.domain.Artist similarArtist : getSimilarArtists(artist, 100, false, musicFolders)) { similarSongs.addAll(mediaFileDao.getSongsByArtist(similarArtist.getName(), 0, 1000)); } Collections.shuffle(similarSongs); @@ -224,7 +224,7 @@ public class LastFmService { * @param artist The artist. * @return Artist bio. */ - public ArtistBio getArtistBio(org.libresonic.player.domain.Artist artist) { + public ArtistBio getArtistBio(org.airsonic.player.domain.Artist artist) { return getArtistBio(getCanonicalArtistName(artist.getName())); } @@ -287,7 +287,7 @@ public class LastFmService { * @param album The album. * @return Album notes. */ - public AlbumNotes getAlbumNotes(org.libresonic.player.domain.Album album) { + public AlbumNotes getAlbumNotes(org.airsonic.player.domain.Album album) { return getAlbumNotes(getCanonicalArtistName(album.getArtist()), album.getName()); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java index 35b58afe..d1e58540 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java @@ -1,36 +1,36 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import net.sf.ehcache.Ehcache; import net.sf.ehcache.Element; +import org.airsonic.player.dao.AlbumDao; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.metadata.JaudiotaggerParser; +import org.airsonic.player.service.metadata.MetaData; +import org.airsonic.player.service.metadata.MetaDataParser; +import org.airsonic.player.service.metadata.MetaDataParserFactory; +import org.airsonic.player.util.FileUtil; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.dao.AlbumDao; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.metadata.JaudiotaggerParser; -import org.libresonic.player.service.metadata.MetaData; -import org.libresonic.player.service.metadata.MetaDataParser; -import org.libresonic.player.service.metadata.MetaDataParserFactory; -import org.libresonic.player.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,8 +38,6 @@ import java.io.File; import java.io.IOException; import java.util.*; -import static org.libresonic.player.domain.MediaFile.MediaType.*; - /** * Provides services for instantiating and caching media files and cover art. * @@ -464,7 +462,7 @@ public class MediaFileService { mediaFile.setComment(existingFile == null ? null : existingFile.getComment()); mediaFile.setChildrenLastUpdated(new Date(0)); mediaFile.setCreated(lastModified); - mediaFile.setMediaType(DIRECTORY); + mediaFile.setMediaType(MediaFile.MediaType.DIRECTORY); mediaFile.setPresent(true); if (file.isFile()) { @@ -505,7 +503,7 @@ public class MediaFileService { } if (firstChild != null) { - mediaFile.setMediaType(ALBUM); + mediaFile.setMediaType(MediaFile.MediaType.ALBUM); // Guess artist/album name, year and genre. MetaDataParser parser = metaDataParserFactory.getParser(firstChild); @@ -538,17 +536,17 @@ public class MediaFileService { private MediaFile.MediaType getMediaType(MediaFile mediaFile) { if (isVideoFile(mediaFile.getFormat())) { - return VIDEO; + return MediaFile.MediaType.VIDEO; } String path = mediaFile.getPath().toLowerCase(); String genre = StringUtils.trimToEmpty(mediaFile.getGenre()).toLowerCase(); if (path.contains("podcast") || genre.contains("podcast")) { - return PODCAST; + return MediaFile.MediaType.PODCAST; } if (path.contains("audiobook") || genre.contains("audiobook") || path.contains("audio book") || genre.contains("audio book")) { - return AUDIOBOOK; + return MediaFile.MediaType.AUDIOBOOK; } - return MUSIC; + return MediaFile.MediaType.MUSIC; } public void refreshMediaFile(MediaFile mediaFile) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MediaScannerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaScannerService.java index 4ab90065..d555c04c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/MediaScannerService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/MediaScannerService.java @@ -1,31 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; +import org.airsonic.player.dao.AlbumDao; +import org.airsonic.player.dao.ArtistDao; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.util.FileUtil; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang3.time.DateUtils; -import org.libresonic.player.dao.AlbumDao; -import org.libresonic.player.dao.ArtistDao; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -391,8 +391,8 @@ public class MediaScannerService { * @return The index file for the given index version. */ private File getIndexFile(int version) { - File home = SettingsService.getLibresonicHome(); - return new File(home, "libresonic" + version + ".index"); + File home = SettingsService.getAirsonicHome(); + return new File(home, "airsonic" + version + ".index"); } public void setSettingsService(SettingsService settingsService) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MusicIndexService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MusicIndexService.java index 669fcac9..3fba4142 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/MusicIndexService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/MusicIndexService.java @@ -1,27 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; -import org.libresonic.player.domain.*; -import org.libresonic.player.domain.MusicIndex.SortableArtist; -import org.libresonic.player.util.FileUtil; +import org.airsonic.player.domain.*; +import org.airsonic.player.domain.MusicIndex.SortableArtist; +import org.airsonic.player.util.FileUtil; import java.io.File; import java.io.IOException; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java b/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java index 8f44b513..99781647 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java index 46dd1afd..781fb855 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java @@ -1,32 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; - +package org.airsonic.player.service; + +import org.airsonic.player.dao.PlayerDao; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.Transcoding; +import org.airsonic.player.domain.TransferStatus; +import org.airsonic.player.domain.User; +import org.airsonic.player.util.StringUtil; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.dao.PlayerDao; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.Transcoding; -import org.libresonic.player.domain.TransferStatus; -import org.libresonic.player.domain.User; -import org.libresonic.player.util.StringUtil; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -238,7 +238,7 @@ public class PlayerService { * * @param username The name of the user. * @param clientId The third-party client ID (used if this player is managed over the - * Libresonic REST API). May be null. + * Airsonic REST API). May be null. * @return All relevant players. */ public List getPlayersForUserAndClientId(String username, String clientId) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java index 5ab20027..e063956f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java @@ -1,38 +1,39 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import chameleon.playlist.SpecificPlaylist; import chameleon.playlist.SpecificPlaylistFactory; import chameleon.playlist.SpecificPlaylistProvider; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.dao.PlaylistDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.PlayQueue; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.playlist.PlaylistExportHandler; +import org.airsonic.player.service.playlist.PlaylistImportHandler; +import org.airsonic.player.util.Pair; +import org.airsonic.player.util.StringUtil; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.dao.PlaylistDao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.playlist.PlaylistExportHandler; -import org.libresonic.player.service.playlist.PlaylistImportHandler; -import org.libresonic.player.util.Pair; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.Assert; @@ -47,7 +48,7 @@ import java.util.*; * Provides services for loading and saving playlists to and from persistent storage. * * @author Sindre Mehus - * @see org.libresonic.player.domain.PlayQueue + * @see PlayQueue */ public class PlaylistService { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java index 49334502..1361728a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java @@ -1,27 +1,36 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import org.airsonic.player.dao.PodcastDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.PodcastChannel; +import org.airsonic.player.domain.PodcastEpisode; +import org.airsonic.player.domain.PodcastStatus; +import org.airsonic.player.service.metadata.MetaData; +import org.airsonic.player.service.metadata.MetaDataParser; +import org.airsonic.player.service.metadata.MetaDataParserFactory; +import org.airsonic.player.util.StringUtil; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; @@ -37,15 +46,6 @@ import org.jdom.Document; import org.jdom.Element; import org.jdom.Namespace; import org.jdom.input.SAXBuilder; -import org.libresonic.player.dao.PodcastDao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.PodcastChannel; -import org.libresonic.player.domain.PodcastEpisode; -import org.libresonic.player.domain.PodcastStatus; -import org.libresonic.player.service.metadata.MetaData; -import org.libresonic.player.service.metadata.MetaDataParser; -import org.libresonic.player.service.metadata.MetaDataParserFactory; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/RatingService.java b/airsonic-main/src/main/java/org/airsonic/player/service/RatingService.java index ab8b087c..4bd03e7f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/RatingService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/RatingService.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; -import org.libresonic.player.dao.RatingDao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.util.FileUtil; +import org.airsonic.player.dao.RatingDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.util.FileUtil; import java.io.File; import java.util.ArrayList; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java index ce6cd90b..1609a584 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java @@ -1,25 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import com.google.common.collect.Lists; +import org.airsonic.player.dao.AlbumDao; +import org.airsonic.player.dao.ArtistDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.util.FileUtil; import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardFilter; @@ -41,10 +45,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.Version; -import org.libresonic.player.dao.AlbumDao; -import org.libresonic.player.dao.ArtistDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.*; -import static org.libresonic.player.service.SearchService.IndexType.*; +import static org.airsonic.player.service.SearchService.IndexType.*; /** * Performs Lucene-based searching and indexing. @@ -166,7 +166,7 @@ public class SearchService { try { reader = createIndexReader(indexType); Searcher searcher = new IndexSearcher(reader); - Analyzer analyzer = new LibresonicAnalyzer(); + Analyzer analyzer = new CustomAnalyzer(); MultiFieldQueryParser queryParser = new MultiFieldQueryParser(LUCENE_VERSION, indexType.getFields(), analyzer, indexType.getBoosts()); @@ -399,7 +399,7 @@ public class SearchService { try { reader = createIndexReader(indexType); Searcher searcher = new IndexSearcher(reader); - Analyzer analyzer = new LibresonicAnalyzer(); + Analyzer analyzer = new CustomAnalyzer(); QueryParser queryParser = new QueryParser(LUCENE_VERSION, field, analyzer); Query q = queryParser.parse(name + "*"); @@ -445,7 +445,7 @@ public class SearchService { private IndexWriter createIndexWriter(IndexType indexType) throws IOException { File dir = getIndexDirectory(indexType); - return new IndexWriter(FSDirectory.open(dir), new LibresonicAnalyzer(), true, new IndexWriter.MaxFieldLength(10)); + return new IndexWriter(FSDirectory.open(dir), new CustomAnalyzer(), true, new IndexWriter.MaxFieldLength(10)); } private IndexReader createIndexReader(IndexType indexType) throws IOException { @@ -454,7 +454,7 @@ public class SearchService { } private File getIndexRootDirectory() { - return new File(SettingsService.getLibresonicHome(), LUCENE_DIR); + return new File(SettingsService.getAirsonicHome(), LUCENE_DIR); } private File getIndexDirectory(IndexType indexType) { @@ -620,8 +620,8 @@ public class SearchService { } } - private class LibresonicAnalyzer extends StandardAnalyzer { - private LibresonicAnalyzer() { + private class CustomAnalyzer extends StandardAnalyzer { + private CustomAnalyzer() { super(LUCENE_VERSION); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java index 8a2719a7..efe8d120 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import net.sf.ehcache.Ehcache; -import org.libresonic.player.dao.UserDao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.User; -import org.libresonic.player.util.FileUtil; +import org.airsonic.player.dao.UserDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.User; +import org.airsonic.player.util.FileUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.dao.DataAccessException; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/ServiceLocator.java b/airsonic-main/src/main/java/org/airsonic/player/service/ServiceLocator.java index acb48562..750493ef 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/ServiceLocator.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/ServiceLocator.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; /** * Locates services for objects that are not part of the Spring context. diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java index 94f3a0fb..82c5a16c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java @@ -1,34 +1,34 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; - +package org.airsonic.player.service; + +import org.airsonic.player.dao.AvatarDao; +import org.airsonic.player.dao.InternetRadioDao; +import org.airsonic.player.dao.MusicFolderDao; +import org.airsonic.player.dao.UserDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.spring.DataSourceConfigType; +import org.airsonic.player.util.FileUtil; +import org.airsonic.player.util.StringUtil; +import org.airsonic.player.util.Util; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.dao.AvatarDao; -import org.libresonic.player.dao.InternetRadioDao; -import org.libresonic.player.dao.MusicFolderDao; -import org.libresonic.player.dao.UserDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.spring.DataSourceConfigType; -import org.libresonic.player.util.FileUtil; -import org.libresonic.player.util.StringUtil; -import org.libresonic.player.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,9 +46,9 @@ import java.util.concurrent.ConcurrentMap; */ public class SettingsService { - // Libresonic home directory. - private static final File LIBRESONIC_HOME_WINDOWS = new File("c:/libresonic"); - private static final File LIBRESONIC_HOME_OTHER = new File("/var/libresonic"); + // Airsonic home directory. + private static final File AIRSONIC_HOME_WINDOWS = new File("c:/airsonic"); + private static final File AIRSONIC_HOME_OTHER = new File("/var/airsonic"); // Global settings. private static final String KEY_INDEX_STRING = "IndexString"; @@ -129,11 +129,11 @@ public class SettingsService { private static final String DEFAULT_VIDEO_FILE_TYPES = "flv avi mpg mpeg mp4 m4v mkv mov wmv ogv divx m2ts"; private static final String DEFAULT_COVER_ART_FILE_TYPES = "cover.jpg cover.png cover.gif folder.jpg jpg jpeg gif png"; private static final int DEFAULT_COVER_ART_CONCURRENCY = 4; - private static final String DEFAULT_WELCOME_TITLE = "Welcome to Libresonic!"; + private static final String DEFAULT_WELCOME_TITLE = "Welcome to Airsonic!"; private static final String DEFAULT_WELCOME_SUBTITLE = null; - private static final String DEFAULT_WELCOME_MESSAGE = "__Welcome to Libresonic!__\n" + + private static final String DEFAULT_WELCOME_MESSAGE = "__Welcome to Airsonic!__\n" + "\\\\ \\\\\n" + - "Libresonic is a free, web-based media streamer, providing ubiquitous access to your music. \n" + + "Airsonic is a free, web-based media streamer, providing ubiquitous access to your music. \n" + "\\\\ \\\\\n" + "Use it to share your music with friends, or to listen to your own music while at work. You can stream to multiple " + "players simultaneously, for instance to one player in your kitchen and another in your living room.\n" + @@ -170,10 +170,10 @@ public class SettingsService { private static final boolean DEFAULT_SORT_ALBUMS_BY_YEAR = true; private static final String DEFAULT_MEDIA_LIBRARY_STATISTICS = "0 0 0 0 0"; private static final boolean DEFAULT_DLNA_ENABLED = false; - private static final String DEFAULT_DLNA_SERVER_NAME = "Libresonic"; + private static final String DEFAULT_DLNA_SERVER_NAME = "Airsonic"; private static final String DEFAULT_DLNA_BASE_LAN_URL = null; private static final boolean DEFAULT_SONOS_ENABLED = false; - private static final String DEFAULT_SONOS_SERVICE_NAME = "Libresonic"; + private static final String DEFAULT_SONOS_SERVICE_NAME = "Airsonic"; private static final int DEFAULT_SONOS_SERVICE_ID = 242; private static final String DEFAULT_EXPORT_PLAYLIST_FORMAT = "m3u"; @@ -182,7 +182,7 @@ public class SettingsService { private static final String DEFAULT_SMTP_PORT = "25"; private static final String DEFAULT_SMTP_USER = null; private static final String DEFAULT_SMTP_PASSWORD = null; - private static final String DEFAULT_SMTP_FROM = "libresonic@libresonic.org"; + private static final String DEFAULT_SMTP_FROM = "airsonic@airsonic.org"; private static final DataSourceConfigType DEFAULT_DATABASE_CONFIG_TYPE = DataSourceConfigType.LEGACY; private static final String DEFAULT_DATABASE_CONFIG_EMBED_DRIVER = null; @@ -205,8 +205,8 @@ public class SettingsService { "database.config.embed.url", "database.config.embed.username", "database.config.embed.password", "database.config.jndi.name", "database.usertable.quote"); - private static final String LOCALES_FILE = "/org/libresonic/player/i18n/locales.txt"; - private static final String THEMES_FILE = "/org/libresonic/player/theme/themes.txt"; + private static final String LOCALES_FILE = "/org/airsonic/player/i18n/locales.txt"; + private static final String THEMES_FILE = "/org/airsonic/player/theme/themes.txt"; private static final Logger LOG = LoggerFactory.getLogger(SettingsService.class); @@ -235,16 +235,16 @@ public class SettingsService { } - public static synchronized File getLibresonicHome() { + public static synchronized File getAirsonicHome() { File home; - String overrideHome = System.getProperty("libresonic.home"); + String overrideHome = System.getProperty("airsonic.home"); if (overrideHome != null) { home = new File(overrideHome); } else { boolean isWindows = System.getProperty("os.name", "Windows").toLowerCase().startsWith("windows"); - home = isWindows ? LIBRESONIC_HOME_WINDOWS : LIBRESONIC_HOME_OTHER; + home = isWindows ? AIRSONIC_HOME_WINDOWS : AIRSONIC_HOME_OTHER; } ensureDirectoryPresent(home); @@ -252,8 +252,8 @@ public class SettingsService { } public static File getLogFile() { - File libresonicHome = SettingsService.getLibresonicHome(); - return new File(libresonicHome, "libresonic.log"); + File airsonicHome = SettingsService.getAirsonicHome(); + return new File(airsonicHome, "airsonic.log"); } @@ -289,7 +289,7 @@ public class SettingsService { boolean success = home.mkdirs(); if (!success) { String message = "The directory " + home + " does not exist. Please create it and make it writable. " + - "(You can override the directory location by specifying -Dlibresonic.home=... when " + + "(You can override the directory location by specifying -Dairsonic.home=... when " + "starting the servlet container.)"; throw new RuntimeException(message); } @@ -297,8 +297,8 @@ public class SettingsService { } public static File getPropertyFile() { - File propertyFile = getLibresonicHome(); - return new File(propertyFile, "libresonic.properties"); + File propertyFile = getAirsonicHome(); + return new File(propertyFile, "airsonic.properties"); } private int getInt(String key, int defaultValue) { @@ -789,7 +789,7 @@ public class SettingsService { } } catch (IOException x) { LOG.error("Failed to resolve list of themes.", x); - themes.add(new Theme("default", "Libresonic default")); + themes.add(new Theme("default", "Airsonic default")); } } return themes.toArray(new Theme[themes.size()]); @@ -835,12 +835,12 @@ public class SettingsService { } /** - * Returns the "brand" name. Normally, this is just "Libresonic". + * Returns the "brand" name. Normally, this is just "Airsonic". * * @return The brand name. */ public String getBrand() { - return "Libresonic"; + return "Airsonic"; } /** diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/ShareService.java b/airsonic-main/src/main/java/org/airsonic/player/service/ShareService.java index b5aa4291..f4483518 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/ShareService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/ShareService.java @@ -1,31 +1,31 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; +import org.airsonic.player.dao.ShareDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.Share; +import org.airsonic.player.domain.User; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.RandomStringUtils; -import org.libresonic.player.dao.ShareDao; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.Share; -import org.libresonic.player.domain.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.util.UriComponentsBuilder; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SonosService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SonosService.java index e3528d4a..459165e8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SonosService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SonosService.java @@ -1,26 +1,33 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; import com.sonos.services._1.*; import com.sonos.services._1_1.SonosSoap; +import org.airsonic.player.domain.AlbumListType; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.domain.User; +import org.airsonic.player.service.sonos.SonosHelper; +import org.airsonic.player.service.sonos.SonosServiceRegistration; +import org.airsonic.player.service.sonos.SonosSoapFault; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.cxf.headers.Header; @@ -28,13 +35,6 @@ import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.jaxws.context.WrappedMessageContext; import org.apache.cxf.message.Message; -import org.libresonic.player.domain.AlbumListType; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Playlist; -import org.libresonic.player.domain.User; -import org.libresonic.player.service.sonos.SonosHelper; -import org.libresonic.player.service.sonos.SonosServiceRegistration; -import org.libresonic.player.service.sonos.SonosSoapFault; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Node; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java b/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java index 255af64c..21845472 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.PlayStatus; -import org.libresonic.player.domain.Player; -import org.libresonic.player.domain.TransferStatus; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.PlayStatus; +import org.airsonic.player.domain.Player; +import org.airsonic.player.domain.TransferStatus; import java.io.File; import java.util.*; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/TranscodingService.java b/airsonic-main/src/main/java/org/airsonic/player/service/TranscodingService.java index 39858d56..82558b10 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/TranscodingService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/TranscodingService.java @@ -1,34 +1,34 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; - +package org.airsonic.player.service; + +import org.airsonic.player.controller.VideoPlayerController; +import org.airsonic.player.dao.TranscodingDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.io.TranscodeInputStream; +import org.airsonic.player.util.StringUtil; +import org.airsonic.player.util.Util; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.filefilter.PrefixFileFilter; import org.apache.commons.lang3.StringUtils; -import org.libresonic.player.controller.VideoPlayerController; -import org.libresonic.player.dao.TranscodingDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.io.TranscodeInputStream; -import org.libresonic.player.util.StringUtil; -import org.libresonic.player.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -361,7 +361,7 @@ public class TranscodingService { // Create temporary file, and feed this to the transcoder. String path = mediaFile.getFile().getAbsolutePath(); if (Util.isWindows() && !mediaFile.isVideo() && !StringUtils.isAsciiPrintable(path)) { - tmpFile = File.createTempFile("libresonic", "." + FilenameUtils.getExtension(path)); + tmpFile = File.createTempFile("airsonic", "." + FilenameUtils.getExtension(path)); tmpFile.deleteOnExit(); FileUtils.copyFile(new File(path), tmpFile); LOG.debug("Created tmp file: " + tmpFile); @@ -479,7 +479,7 @@ public class TranscodingService { * Returns the directory in which all transcoders are installed. */ public File getTranscodeDirectory() { - File dir = new File(SettingsService.getLibresonicHome(), "transcode"); + File dir = new File(SettingsService.getAirsonicHome(), "transcode"); if (!dir.exists()) { boolean ok = dir.mkdir(); if (ok) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/UPnPService.java b/airsonic-main/src/main/java/org/airsonic/player/service/UPnPService.java index c6e06c4b..4df1e7ac 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/UPnPService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/UPnPService.java @@ -1,24 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; +import org.airsonic.player.service.upnp.ApacheUpnpServiceConfiguration; +import org.airsonic.player.service.upnp.CustomContentDirectory; +import org.airsonic.player.service.upnp.MSMediaReceiverRegistrarService; import org.fourthline.cling.UpnpService; import org.fourthline.cling.UpnpServiceImpl; import org.fourthline.cling.binding.annotations.AnnotationLocalServiceBinder; @@ -32,9 +35,6 @@ import org.fourthline.cling.support.connectionmanager.ConnectionManagerService; import org.fourthline.cling.support.model.ProtocolInfos; import org.fourthline.cling.support.model.dlna.DLNAProfiles; import org.fourthline.cling.support.model.dlna.DLNAProtocolInfo; -import org.libresonic.player.service.upnp.ApacheUpnpServiceConfiguration; -import org.libresonic.player.service.upnp.LibresonicContentDirectory; -import org.libresonic.player.service.upnp.MSMediaReceiverRegistrarService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +53,7 @@ public class UPnPService { private SettingsService settingsService; private UpnpService upnpService; - private LibresonicContentDirectory libresonicContentDirectory; + private CustomContentDirectory customContentDirectory; private AtomicReference running = new AtomicReference<>(false); public void init() { @@ -147,12 +147,12 @@ public class UPnPService { Icon icon = new Icon("image/png", 512, 512, 32, "logo-512", getClass().getResourceAsStream("logo-512.png")); - LocalService contentDirectoryservice = new AnnotationLocalServiceBinder().read(LibresonicContentDirectory.class); - contentDirectoryservice.setManager(new DefaultServiceManager(contentDirectoryservice) { + LocalService contentDirectoryservice = new AnnotationLocalServiceBinder().read(CustomContentDirectory.class); + contentDirectoryservice.setManager(new DefaultServiceManager(contentDirectoryservice) { @Override - protected LibresonicContentDirectory createServiceInstance() throws Exception { - return libresonicContentDirectory; + protected CustomContentDirectory createServiceInstance() throws Exception { + return customContentDirectory; } }); @@ -205,7 +205,7 @@ public class UPnPService { this.settingsService = settingsService; } - public void setLibresonicContentDirectory(LibresonicContentDirectory libresonicContentDirectory) { - this.libresonicContentDirectory = libresonicContentDirectory; + public void setCustomContentDirectory(CustomContentDirectory customContentDirectory) { + this.customContentDirectory = customContentDirectory; } } diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/VersionService.java b/airsonic-main/src/main/java/org/airsonic/player/service/VersionService.java index e3db6176..0790126c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/VersionService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/VersionService.java @@ -1,24 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service; +package org.airsonic.player.service; +import org.airsonic.player.domain.Version; import org.apache.commons.io.IOUtils; import org.apache.http.client.ResponseHandler; import org.apache.http.client.config.RequestConfig; @@ -26,7 +27,6 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.libresonic.player.domain.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ import java.util.regex.Pattern; /** * Provides version-related services, including functionality for determining whether a newer - * version of Libresonic is available. + * version of Airsonic is available. * * @author Sindre Mehus */ @@ -67,29 +67,29 @@ public class VersionService { /** * URL from which to fetch latest versions. */ - private static final String VERSION_URL = "http://libresonic.org/release/version.txt"; + private static final String VERSION_URL = "http://airsonic.org/release/version.txt"; /** - * Returns the version number for the locally installed Libresonic version. + * Returns the version number for the locally installed Airsonic version. * - * @return The version number for the locally installed Libresonic version. + * @return The version number for the locally installed Airsonic version. */ public synchronized Version getLocalVersion() { if (localVersion == null) { try { localVersion = new Version(readLineFromResource("/version.txt")); - LOG.info("Resolved local Libresonic version to: " + localVersion); + LOG.info("Resolved local Airsonic version to: " + localVersion); } catch (Exception x) { - LOG.warn("Failed to resolve local Libresonic version.", x); + LOG.warn("Failed to resolve local Airsonic version.", x); } } return localVersion; } /** - * Returns the version number for the latest available Libresonic final version. + * Returns the version number for the latest available Airsonic final version. * - * @return The version number for the latest available Libresonic final version, or null + * @return The version number for the latest available Airsonic final version, or null * if the version number can't be resolved. */ public synchronized Version getLatestFinalVersion() { @@ -98,9 +98,9 @@ public class VersionService { } /** - * Returns the version number for the latest available Libresonic beta version. + * Returns the version number for the latest available Airsonic beta version. * - * @return The version number for the latest available Libresonic beta version, or null + * @return The version number for the latest available Airsonic beta version, or null * if the version number can't be resolved. */ public synchronized Version getLatestBetaVersion() { @@ -109,9 +109,9 @@ public class VersionService { } /** - * Returns the build date for the locally installed Libresonic version. + * Returns the build date for the locally installed Airsonic version. * - * @return The build date for the locally installed Libresonic version, or null + * @return The build date for the locally installed Airsonic version, or null * if the build date can't be resolved. */ public synchronized Date getLocalBuildDate() { @@ -120,16 +120,16 @@ public class VersionService { String date = readLineFromResource("/build_date.txt"); localBuildDate = DATE_FORMAT.parse(date); } catch (Exception x) { - LOG.warn("Failed to resolve local Libresonic build date.", x); + LOG.warn("Failed to resolve local Airsonic build date.", x); } } return localBuildDate; } /** - * Returns the build number for the locally installed Libresonic version. + * Returns the build number for the locally installed Airsonic version. * - * @return The build number for the locally installed Libresonic version, or null + * @return The build number for the locally installed Airsonic version, or null * if the build number can't be resolved. */ public synchronized String getLocalBuildNumber() { @@ -137,16 +137,16 @@ public class VersionService { try { localBuildNumber = readLineFromResource("/build_number.txt"); } catch (Exception x) { - LOG.warn("Failed to resolve local Libresonic build number.", x); + LOG.warn("Failed to resolve local Airsonic build number.", x); } } return localBuildNumber; } /** - * Returns whether a new final version of Libresonic is available. + * Returns whether a new final version of Airsonic is available. * - * @return Whether a new final version of Libresonic is available. + * @return Whether a new final version of Airsonic is available. */ public boolean isNewFinalVersionAvailable() { Version latest = getLatestFinalVersion(); @@ -160,9 +160,9 @@ public class VersionService { } /** - * Returns whether a new beta version of Libresonic is available. + * Returns whether a new beta version of Airsonic is available. * - * @return Whether a new beta version of Libresonic is available. + * @return Whether a new beta version of Airsonic is available. */ public boolean isNewBetaVersionAvailable() { Version latest = getLatestBetaVersion(); @@ -212,13 +212,13 @@ public class VersionService { lastVersionFetched = now; readLatestVersion(); } catch (Exception x) { - LOG.warn("Failed to resolve latest Libresonic version.", x); + LOG.warn("Failed to resolve latest Airsonic version.", x); } } } /** - * Resolves the latest available Libresonic version by screen-scraping a web page. + * Resolves the latest available Airsonic version by screen-scraping a web page. * * @throws IOException If an I/O error occurs. */ @@ -236,8 +236,8 @@ public class VersionService { content = client.execute(method, responseHandler); } - Pattern finalPattern = Pattern.compile("LIBRESONIC_FULL_VERSION_BEGIN(.*)LIBRESONIC_FULL_VERSION_END"); - Pattern betaPattern = Pattern.compile("LIBRESONIC_BETA_VERSION_BEGIN(.*)LIBRESONIC_BETA_VERSION_END"); + Pattern finalPattern = Pattern.compile("AIRSONIC_FULL_VERSION_BEGIN(.*)AIRSONIC_FULL_VERSION_END"); + Pattern betaPattern = Pattern.compile("AIRSONIC_BETA_VERSION_BEGIN(.*)AIRSONIC_BETA_VERSION_END"); try (BufferedReader reader = new BufferedReader(new StringReader(content))) { String line = reader.readLine(); @@ -245,12 +245,12 @@ public class VersionService { Matcher finalMatcher = finalPattern.matcher(line); if (finalMatcher.find()) { latestFinalVersion = new Version(finalMatcher.group(1)); - LOG.info("Resolved latest Libresonic final version to: " + latestFinalVersion); + LOG.info("Resolved latest Airsonic final version to: " + latestFinalVersion); } Matcher betaMatcher = betaPattern.matcher(line); if (betaMatcher.find()) { latestBetaVersion = new Version(betaMatcher.group(1)); - LOG.info("Resolved latest Libresonic beta version to: " + latestBetaVersion); + LOG.info("Resolved latest Airsonic beta version to: " + latestBetaVersion); } line = reader.readLine(); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/AudioPlayer.java b/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/AudioPlayer.java index 861e9d7f..46820968 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/AudioPlayer.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/AudioPlayer.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.jukebox; +package org.airsonic.player.service.jukebox; +import org.airsonic.player.service.JukeboxService; import org.apache.commons.io.IOUtils; -import org.libresonic.player.service.JukeboxService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.concurrent.atomic.AtomicReference; -import static org.libresonic.player.service.jukebox.AudioPlayer.State.*; +import static org.airsonic.player.service.jukebox.AudioPlayer.State.*; /** * A simple wrapper for playing sound from an input stream. diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/PlayerTest.java b/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/PlayerTest.java index a91fd858..0fffa1e9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/PlayerTest.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/PlayerTest.java @@ -1,4 +1,4 @@ -package org.libresonic.player.service.jukebox; +package org.airsonic.player.service.jukebox; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java index 7723f31f..147667e2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.metadata; +package org.airsonic.player.service.metadata; -import org.libresonic.player.domain.MediaFile; +import org.airsonic.player.domain.MediaFile; import java.io.File; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java index 011f282c..314e5329 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.metadata; +package org.airsonic.player.service.metadata; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.io.InputStreamReaderThread; +import org.airsonic.player.service.ServiceLocator; +import org.airsonic.player.service.TranscodingService; +import org.airsonic.player.util.StringUtil; import org.apache.commons.io.FilenameUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.io.InputStreamReaderThread; -import org.libresonic.player.service.ServiceLocator; -import org.libresonic.player.service.TranscodingService; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java index e5296f27..32f4534e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java @@ -1,24 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.metadata; +package org.airsonic.player.service.metadata; +import org.airsonic.player.domain.MediaFile; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.jaudiotagger.audio.AudioFile; @@ -28,7 +29,6 @@ import org.jaudiotagger.tag.FieldKey; import org.jaudiotagger.tag.Tag; import org.jaudiotagger.tag.images.Artwork; import org.jaudiotagger.tag.reference.GenreTypes; -import org.libresonic.player.domain.MediaFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaData.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaData.java index bb5b3f97..02e9949d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaData.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaData.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.metadata; +package org.airsonic.player.service.metadata; /** * Contains meta-data (song title, artist, album etc) for a music file. diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParser.java index f820aad8..fc76ada0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParser.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParser.java @@ -1,30 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.metadata; +package org.airsonic.player.service.metadata; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.service.ServiceLocator; +import org.airsonic.player.service.SettingsService; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.service.ServiceLocator; -import org.libresonic.player.service.SettingsService; import java.io.File; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParserFactory.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParserFactory.java index dcc892f5..cb26ef8b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParserFactory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParserFactory.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.metadata; +package org.airsonic.player.service.metadata; import java.io.File; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistExportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistExportHandler.java index c9eb7b7d..f43a5b57 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistExportHandler.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistExportHandler.java @@ -1,12 +1,12 @@ -package org.libresonic.player.service.playlist; +package org.airsonic.player.service.playlist; import chameleon.content.Content; import chameleon.playlist.Media; import chameleon.playlist.Playlist; import chameleon.playlist.SpecificPlaylist; import chameleon.playlist.SpecificPlaylistProvider; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.MediaFile; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.MediaFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.Ordered; import org.springframework.stereotype.Component; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistImportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistImportHandler.java index be35bb46..d873ca2f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistImportHandler.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistImportHandler.java @@ -1,9 +1,9 @@ -package org.libresonic.player.service.playlist; +package org.airsonic.player.service.playlist; import chameleon.playlist.*; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.util.Pair; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.util.Pair; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.Ordered; import org.springframework.stereotype.Component; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistExportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistExportHandler.java index 88b8aeaf..3ea30b73 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistExportHandler.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistExportHandler.java @@ -1,4 +1,4 @@ -package org.libresonic.player.service.playlist; +package org.airsonic.player.service.playlist; import chameleon.playlist.SpecificPlaylist; import chameleon.playlist.SpecificPlaylistProvider; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistImportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistImportHandler.java index 55408d13..3d0d0df9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistImportHandler.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistImportHandler.java @@ -1,8 +1,8 @@ -package org.libresonic.player.service.playlist; +package org.airsonic.player.service.playlist; import chameleon.playlist.SpecificPlaylist; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.util.Pair; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.util.Pair; import org.springframework.core.Ordered; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistExportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistExportHandler.java index e349f4c5..04240222 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistExportHandler.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistExportHandler.java @@ -1,13 +1,14 @@ -package org.libresonic.player.service.playlist; +package org.airsonic.player.service.playlist; import chameleon.playlist.SpecificPlaylist; import chameleon.playlist.SpecificPlaylistProvider; import chameleon.playlist.xspf.Location; import chameleon.playlist.xspf.Track; import chameleon.playlist.xspf.XspfProvider; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.dao.PlaylistDao; -import org.libresonic.player.domain.MediaFile; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.dao.PlaylistDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Playlist; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,9 +37,9 @@ public class XspfPlaylistExportHandler implements PlaylistExportHandler { chameleon.playlist.xspf.Playlist createXsfpPlaylistFromDBId(int id) { chameleon.playlist.xspf.Playlist newPlaylist = new chameleon.playlist.xspf.Playlist(); - org.libresonic.player.domain.Playlist playlist = playlistDao.getPlaylist(id); + Playlist playlist = playlistDao.getPlaylist(id); newPlaylist.setTitle(playlist.getName()); - newPlaylist.setCreator("Libresonic user " + playlist.getUsername()); + newPlaylist.setCreator("Airsonic user " + playlist.getUsername()); newPlaylist.setDate(new Date()); List files = mediaFileDao.getFilesInPlaylist(id); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistImportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistImportHandler.java index 1128514e..fff8bdc9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistImportHandler.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistImportHandler.java @@ -1,12 +1,12 @@ -package org.libresonic.player.service.playlist; +package org.airsonic.player.service.playlist; import chameleon.playlist.SpecificPlaylist; import chameleon.playlist.xspf.Location; import chameleon.playlist.xspf.Playlist; import chameleon.playlist.xspf.StringContainer; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.util.Pair; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.util.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/AlbumList.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/AlbumList.java index 6ab2c396..3ce34730 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/AlbumList.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/AlbumList.java @@ -1,25 +1,25 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.service.sonos; +package org.airsonic.player.service.sonos; -import org.libresonic.player.domain.MediaFile; +import org.airsonic.player.domain.MediaFile; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosFaultInterceptor.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosFaultInterceptor.java index daf861b9..89dcf8bf 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosFaultInterceptor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosFaultInterceptor.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.service.sonos; +package org.airsonic.player.service.sonos; import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosHelper.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosHelper.java index 3ec5fb58..01c1e144 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosHelper.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosHelper.java @@ -1,40 +1,40 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.service.sonos; +package org.airsonic.player.service.sonos; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.sonos.services._1.*; -import org.libresonic.player.controller.CoverArtController; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.*; -import org.libresonic.player.util.StringUtil; -import org.libresonic.player.util.Util; +import org.airsonic.player.controller.CoverArtController; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.*; +import org.airsonic.player.util.StringUtil; +import org.airsonic.player.util.Util; import javax.servlet.http.HttpServletRequest; import java.util.*; -import static org.libresonic.player.service.NetworkService.getBaseUrl; +import static org.airsonic.player.service.NetworkService.getBaseUrl; /** * @author Sindre Mehus @@ -42,7 +42,7 @@ import static org.libresonic.player.service.NetworkService.getBaseUrl; */ public class SonosHelper { - public static final String LIBRESONIC_CLIENT_ID = "sonos"; + public static final String AIRSONIC_CLIENT_ID = "sonos"; private MediaFileService mediaFileService; private PlaylistService playlistService; @@ -638,17 +638,17 @@ public class SonosHelper { } private Player createPlayerIfNecessary(String username) { - List players = playerService.getPlayersForUserAndClientId(username, LIBRESONIC_CLIENT_ID); + List players = playerService.getPlayersForUserAndClientId(username, AIRSONIC_CLIENT_ID); // If not found, create it. if (players.isEmpty()) { Player player = new Player(); player.setUsername(username); - player.setClientId(LIBRESONIC_CLIENT_ID); + player.setClientId(AIRSONIC_CLIENT_ID); player.setName("Sonos"); player.setTechnology(PlayerTechnology.EXTERNAL_WITH_PLAYLIST); playerService.createPlayer(player); - players = playerService.getPlayersForUserAndClientId(username, LIBRESONIC_CLIENT_ID); + players = playerService.getPlayersForUserAndClientId(username, AIRSONIC_CLIENT_ID); } return players.get(0); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosServiceRegistration.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosServiceRegistration.java index 39e1f16f..d83b1805 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosServiceRegistration.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosServiceRegistration.java @@ -1,24 +1,26 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.service.sonos; +package org.airsonic.player.service.sonos; +import org.airsonic.player.util.Pair; +import org.airsonic.player.util.StringUtil; import org.apache.http.NameValuePair; import org.apache.http.client.ResponseHandler; import org.apache.http.client.config.RequestConfig; @@ -29,8 +31,6 @@ import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; -import org.libresonic.player.util.Pair; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,12 +46,12 @@ public class SonosServiceRegistration { private static final Logger LOG = LoggerFactory.getLogger(SonosServiceRegistration.class); - public void setEnabled(String libresonicBaseUrl, String sonosControllerIp, boolean enabled, String sonosServiceName, int sonosServiceId) throws IOException { - String localUrl = libresonicBaseUrl + "ws/Sonos"; + public void setEnabled(String airsonicBaseUrl, String sonosControllerIp, boolean enabled, String sonosServiceName, int sonosServiceId) throws IOException { + String localUrl = airsonicBaseUrl + "ws/Sonos"; String controllerUrl = String.format("http://%s:1400/customsd", sonosControllerIp); LOG.info((enabled ? "Enabling" : "Disabling") + " Sonos music service, using Sonos controller IP " + sonosControllerIp + - ", SID " + sonosServiceId + ", and Libresonic URL " + localUrl); + ", SID " + sonosServiceId + ", and Airsonic URL " + localUrl); List> params = new ArrayList>(); params.add(Pair.create("sid", String.valueOf(sonosServiceId))); @@ -68,9 +68,9 @@ public class SonosServiceRegistration { params.add(Pair.create("caps", "ucPlaylists")); params.add(Pair.create("caps", "extendedMD")); params.add(Pair.create("presentationMapVersion", "1")); - params.add(Pair.create("presentationMapUri", libresonicBaseUrl + "sonos/presentationMap.xml")); + params.add(Pair.create("presentationMapUri", airsonicBaseUrl + "sonos/presentationMap.xml")); params.add(Pair.create("stringsVersion", "5")); - params.add(Pair.create("stringsUri", libresonicBaseUrl + "sonos/strings.xml")); + params.add(Pair.create("stringsUri", airsonicBaseUrl + "sonos/strings.xml")); } String result = execute(controllerUrl, params); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosSoapFault.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosSoapFault.java index 8bb92c53..a27534a9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosSoapFault.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosSoapFault.java @@ -1,23 +1,23 @@ /* - * This file is part of Libresonic. + * This file is part of Airsonic. * - * Libresonic is free software: you can redistribute it and/or modify + * Airsonic 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, + * Airsonic 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 . + * along with Airsonic. If not, see . * * Copyright 2015 (C) Sindre Mehus */ -package org.libresonic.player.service.sonos; +package org.airsonic.player.service.sonos; /** * @author Sindre Mehus diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java index 62fb4e7c..d4e04613 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java @@ -1,33 +1,37 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; + +import org.airsonic.player.dao.AlbumDao; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.Album; +import org.airsonic.player.domain.CoverArtScheme; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.service.SearchService; import org.fourthline.cling.support.model.BrowseResult; import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.PersonWithRole; import org.fourthline.cling.support.model.SortCriterion; import org.fourthline.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.MusicAlbum; -import org.libresonic.player.dao.AlbumDao; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.SearchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.util.UriComponentsBuilder; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ApacheUpnpServiceConfiguration.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ApacheUpnpServiceConfiguration.java index 732e0772..966c3c45 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ApacheUpnpServiceConfiguration.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ApacheUpnpServiceConfiguration.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2013 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; import org.fourthline.cling.DefaultUpnpServiceConfiguration; import org.fourthline.cling.transport.impl.apache.StreamClientConfigurationImpl; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java index 2c8bd1c3..5a8b88e2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java @@ -1,30 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; +import org.airsonic.player.dao.ArtistDao; +import org.airsonic.player.domain.Album; +import org.airsonic.player.domain.Artist; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.service.SearchService; import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.MusicArtist; -import org.libresonic.player.dao.ArtistDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.SearchService; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/CustomContentDirectory.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/CustomContentDirectory.java index 8f681e76..eb5adf6e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/CustomContentDirectory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/CustomContentDirectory.java @@ -1,25 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; import com.google.common.collect.Lists; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Player; +import org.airsonic.player.service.JWTSecurityService; +import org.airsonic.player.service.PlayerService; +import org.airsonic.player.service.SettingsService; +import org.airsonic.player.service.TranscodingService; +import org.airsonic.player.util.StringUtil; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.fourthline.cling.support.contentdirectory.AbstractContentDirectoryService; @@ -29,13 +36,6 @@ import org.fourthline.cling.support.model.BrowseResult; import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.Res; import org.fourthline.cling.support.model.SortCriterion; -import org.libresonic.player.domain.MediaFile; -import org.libresonic.player.domain.Player; -import org.libresonic.player.service.JWTSecurityService; -import org.libresonic.player.service.PlayerService; -import org.libresonic.player.service.SettingsService; -import org.libresonic.player.service.TranscodingService; -import org.libresonic.player.util.StringUtil; import org.seamless.util.MimeType; import org.springframework.web.util.UriComponentsBuilder; @@ -43,7 +43,7 @@ import org.springframework.web.util.UriComponentsBuilder; * @author Sindre Mehus * @version $Id: TagBasedContentDirectory.java 3739 2013-12-03 11:55:01Z sindre_mehus $ */ -public abstract class LibresonicContentDirectory extends AbstractContentDirectoryService { +public abstract class CustomContentDirectory extends AbstractContentDirectoryService { protected static final String CONTAINER_ID_ROOT = "0"; @@ -52,7 +52,7 @@ public abstract class LibresonicContentDirectory extends AbstractContentDirector private TranscodingService transcodingService; protected JWTSecurityService jwtSecurityService; - public LibresonicContentDirectory() { + public CustomContentDirectory() { super(Lists.newArrayList("*"), Lists.newArrayList()); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java index ab60176f..6ae03abb 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java @@ -1,40 +1,32 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; +import org.airsonic.player.domain.CoverArtScheme; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.service.*; import org.fourthline.cling.support.contentdirectory.ContentDirectoryErrorCode; import org.fourthline.cling.support.contentdirectory.ContentDirectoryException; -import org.fourthline.cling.support.model.BrowseFlag; -import org.fourthline.cling.support.model.BrowseResult; -import org.fourthline.cling.support.model.DIDLObject; -import org.fourthline.cling.support.model.PersonWithRole; -import org.fourthline.cling.support.model.SortCriterion; +import org.fourthline.cling.support.model.*; import org.fourthline.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.MusicTrack; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.JWTSecurityService; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.MusicIndexService; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.service.SearchService; -import org.libresonic.player.service.SettingsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +41,7 @@ import java.util.Arrays; * @author Sindre Mehus * @version $Id$ */ -public class DispatchingContentDirectory extends LibresonicContentDirectory { +public class DispatchingContentDirectory extends CustomContentDirectory { public static final Logger LOG = LoggerFactory.getLogger(DispatchingContentDirectory.class); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/FolderBasedContentDirectory.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/FolderBasedContentDirectory.java index 194ac55a..5cfed558 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/FolderBasedContentDirectory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/FolderBasedContentDirectory.java @@ -1,24 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; +import org.airsonic.player.domain.*; +import org.airsonic.player.service.MediaFileService; +import org.airsonic.player.service.PlaylistService; +import org.airsonic.player.util.Util; import org.fourthline.cling.support.contentdirectory.ContentDirectoryErrorCode; import org.fourthline.cling.support.contentdirectory.ContentDirectoryException; import org.fourthline.cling.support.model.*; @@ -28,10 +32,6 @@ import org.fourthline.cling.support.model.container.PlaylistContainer; import org.fourthline.cling.support.model.container.StorageFolder; import org.fourthline.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.MusicTrack; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.MediaFileService; -import org.libresonic.player.service.PlaylistService; -import org.libresonic.player.util.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.util.UriComponentsBuilder; @@ -45,7 +45,7 @@ import java.util.List; * @author Sindre Mehus * @version $Id$ */ -public class FolderBasedContentDirectory extends LibresonicContentDirectory { +public class FolderBasedContentDirectory extends CustomContentDirectory { private static final Logger LOG = LoggerFactory.getLogger(FolderBasedContentDirectory.class); private static final String CONTAINER_ID_PLAYLIST_ROOT = "playlists"; @@ -96,7 +96,7 @@ public class FolderBasedContentDirectory extends LibresonicContentDirectory { MediaLibraryStatistics statistics = settingsService.getMediaLibraryStatistics(); root.setStorageUsed(statistics == null ? 0 : statistics.getTotalLengthInBytes()); - root.setTitle("Libresonic Media"); + root.setTitle("Airsonic Media"); root.setRestricted(true); root.setSearchable(false); root.setWriteStatus(WriteStatus.NOT_WRITABLE); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java index e85bf5a9..9cb7092d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java @@ -1,30 +1,33 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; + +import org.airsonic.player.domain.Genre; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.util.Util; import org.fourthline.cling.support.model.BrowseResult; import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.SortCriterion; import org.fourthline.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.GenreContainer; -import org.libresonic.player.domain.*; -import org.libresonic.player.util.Util; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MSMediaReceiverRegistrarService.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MSMediaReceiverRegistrarService.java index 2231232d..6ebffde5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MSMediaReceiverRegistrarService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MSMediaReceiverRegistrarService.java @@ -1,4 +1,4 @@ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; import org.fourthline.cling.support.xmicrosoft.AbstractMediaReceiverRegistrarService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MediaFileUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MediaFileUpnpProcessor.java index ce3d1ae3..1d92df16 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MediaFileUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MediaFileUpnpProcessor.java @@ -1,24 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; +import org.airsonic.player.dao.MediaFileDao; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.service.MediaFileService; import org.fourthline.cling.support.model.BrowseResult; import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.DIDLObject; @@ -26,9 +30,6 @@ import org.fourthline.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.MusicAlbum; import org.fourthline.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.MusicTrack; -import org.libresonic.player.dao.MediaFileDao; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.MediaFileService; import org.springframework.beans.factory.annotation.Autowired; import java.net.URI; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/NATPMPRouter.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/NATPMPRouter.java index e9106714..dfb03009 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/NATPMPRouter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/NATPMPRouter.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; import com.hoodcomputing.natpmp.MapRequestMessage; import com.hoodcomputing.natpmp.NatPmpDevice; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/PlaylistUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/PlaylistUpnpProcessor.java index 88c79e2a..d0871a7a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/PlaylistUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/PlaylistUpnpProcessor.java @@ -1,29 +1,30 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.Playlist; +import org.airsonic.player.service.PlaylistService; import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.PlaylistContainer; -import org.libresonic.player.domain.*; -import org.libresonic.player.service.PlaylistService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RecentAlbumUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RecentAlbumUpnpProcessor.java index 3c491d17..ed812bfe 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RecentAlbumUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RecentAlbumUpnpProcessor.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; -import org.libresonic.player.domain.Album; -import org.libresonic.player.domain.MusicFolder; +package org.airsonic.player.service.upnp; +import org.airsonic.player.domain.Album; +import org.airsonic.player.domain.MusicFolder; import java.util.List; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RootUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RootUpnpProcessor.java index 6fc9daca..daca3fe5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RootUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RootUpnpProcessor.java @@ -1,28 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; + +import org.airsonic.player.domain.MediaLibraryStatistics; import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.WriteStatus; import org.fourthline.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.StorageFolder; -import org.libresonic.player.domain.MediaLibraryStatistics; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -44,7 +45,7 @@ public class RootUpnpProcessor extends UpnpContentProcessor . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; /** * @author Sindre Mehus diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java index 25db011a..ced6903f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java @@ -1,24 +1,27 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2017 (C) Libresonic Authors + Copyright 2017 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.service.upnp; +package org.airsonic.player.service.upnp; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.ParamSearchResult; +import org.airsonic.player.util.Util; import org.fourthline.cling.support.contentdirectory.ContentDirectoryException; import org.fourthline.cling.support.contentdirectory.DIDLParser; import org.fourthline.cling.support.model.BrowseResult; @@ -26,9 +29,6 @@ import org.fourthline.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.SortCriterion; import org.fourthline.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.StorageFolder; -import org.libresonic.player.domain.MusicFolder; -import org.libresonic.player.domain.ParamSearchResult; -import org.libresonic.player.util.Util; import org.springframework.beans.factory.annotation.Autowired; import java.lang.reflect.ParameterizedType; diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/CommonsConfigurationPropertySource.java b/airsonic-main/src/main/java/org/airsonic/player/spring/CommonsConfigurationPropertySource.java index 3e9b02a0..17a4b4c8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/CommonsConfigurationPropertySource.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/CommonsConfigurationPropertySource.java @@ -1,4 +1,4 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; import org.apache.commons.configuration2.ImmutableConfiguration; import org.springframework.core.env.PropertySource; diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/CustomPropertySourceConfigurer.java b/airsonic-main/src/main/java/org/airsonic/player/spring/CustomPropertySourceConfigurer.java index f7ab9722..4ec4783d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/CustomPropertySourceConfigurer.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/CustomPropertySourceConfigurer.java @@ -1,16 +1,16 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; import com.google.common.collect.Lists; +import org.airsonic.player.service.ApacheCommonsConfigurationService; import org.apache.commons.configuration2.ImmutableConfiguration; import org.apache.commons.lang3.StringUtils; -import org.libresonic.player.service.ApacheCommonsConfigurationService; import org.springframework.context.ApplicationContextInitializer; import org.springframework.core.env.PropertySource; import org.springframework.web.context.ConfigurableWebApplicationContext; import java.util.List; -public class LibresonicPropertySourceConfigurer implements +public class CustomPropertySourceConfigurer implements ApplicationContextInitializer { public static final String DATASOURCE_CONFIG_TYPE = "DatabaseConfigType"; @@ -20,7 +20,7 @@ public class LibresonicPropertySourceConfigurer implements ApacheCommonsConfigurationService configurationService = new ApacheCommonsConfigurationService(); ImmutableConfiguration snapshot = configurationService.getImmutableSnapshot(); - PropertySource ps = new CommonsConfigurationPropertySource("libresonic-pre-init-configs", snapshot); + PropertySource ps = new CommonsConfigurationPropertySource("airsonic-pre-init-configs", snapshot); ctx.getEnvironment().getPropertySources().addLast(ps); diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/DataSourceConfigType.java b/airsonic-main/src/main/java/org/airsonic/player/spring/DataSourceConfigType.java index 623259e3..5643fc00 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/DataSourceConfigType.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/DataSourceConfigType.java @@ -1,4 +1,4 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; public enum DataSourceConfigType { JNDI, diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/DbmsVersionPrecondition.java b/airsonic-main/src/main/java/org/airsonic/player/spring/DbmsVersionPrecondition.java index 89161061..0f8516e4 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/DbmsVersionPrecondition.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/DbmsVersionPrecondition.java @@ -1,4 +1,4 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; import liquibase.database.Database; import liquibase.exception.CustomPreconditionErrorException; diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/HsqlDatabase.java b/airsonic-main/src/main/java/org/airsonic/player/spring/HsqlDatabase.java index e169194d..6657192e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/HsqlDatabase.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/HsqlDatabase.java @@ -1,4 +1,4 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; import liquibase.exception.DatabaseException; diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingExceptionResolver.java b/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingExceptionResolver.java index 1b8a067f..f374b74d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingExceptionResolver.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingExceptionResolver.java @@ -1,4 +1,4 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingFileOverrideListener.java b/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingFileOverrideListener.java index 56ee90bb..935131b2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingFileOverrideListener.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingFileOverrideListener.java @@ -1,5 +1,6 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; +import org.airsonic.player.service.SettingsService; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.logging.LogFile; import org.springframework.boot.logging.LoggingApplicationListener; @@ -10,15 +11,13 @@ import org.springframework.core.env.PropertySource; import java.util.Collections; -import static org.libresonic.player.service.SettingsService.getLogFile; - public class LoggingFileOverrideListener implements ApplicationListener, Ordered { @Override public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) { PropertySource ps = new MapPropertySource("LogFileLocationPS", - Collections.singletonMap(LogFile.FILE_PROPERTY, getLogFile().getAbsolutePath())); + Collections.singletonMap(LogFile.FILE_PROPERTY, SettingsService.getLogFile().getAbsolutePath())); event.getEnvironment().getPropertySources().addLast(ps); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java b/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java index 43011cc7..045fb7e3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java @@ -1,4 +1,4 @@ -package org.libresonic.player.spring; +package org.airsonic.player.spring; import liquibase.database.Database; import liquibase.database.DatabaseConnection; diff --git a/airsonic-main/src/main/java/org/airsonic/player/taglib/EscapeJavaScriptTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/EscapeJavaScriptTag.java index 2d786ed5..4adaf5be 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/taglib/EscapeJavaScriptTag.java +++ b/airsonic-main/src/main/java/org/airsonic/player/taglib/EscapeJavaScriptTag.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.taglib; +package org.airsonic.player.taglib; import org.apache.commons.lang.StringEscapeUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/taglib/FormatBytesTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/FormatBytesTag.java index f89a603d..2fb0a295 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/taglib/FormatBytesTag.java +++ b/airsonic-main/src/main/java/org/airsonic/player/taglib/FormatBytesTag.java @@ -1,25 +1,25 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.taglib; +package org.airsonic.player.taglib; -import org.libresonic.player.util.StringUtil; +import org.airsonic.player.util.StringUtil; import org.springframework.web.servlet.support.RequestContextUtils; import javax.servlet.http.HttpServletRequest; diff --git a/airsonic-main/src/main/java/org/airsonic/player/taglib/ParamTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/ParamTag.java index 3f110f63..50077d67 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/taglib/ParamTag.java +++ b/airsonic-main/src/main/java/org/airsonic/player/taglib/ParamTag.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.taglib; +package org.airsonic.player.taglib; import javax.servlet.jsp.JspTagException; import javax.servlet.jsp.tagext.TagSupport; diff --git a/airsonic-main/src/main/java/org/airsonic/player/taglib/UrlTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/UrlTag.java index 401fc780..a8bab7b0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/taglib/UrlTag.java +++ b/airsonic-main/src/main/java/org/airsonic/player/taglib/UrlTag.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.taglib; +package org.airsonic.player.taglib; +import org.airsonic.player.filter.ParameterDecodingFilter; +import org.airsonic.player.util.StringUtil; import org.apache.commons.lang.CharUtils; import org.apache.taglibs.standard.tag.common.core.UrlSupport; -import org.libresonic.player.filter.ParameterDecodingFilter; -import org.libresonic.player.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/taglib/WikiTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/WikiTag.java index 23d51d06..c1bde539 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/taglib/WikiTag.java +++ b/airsonic-main/src/main/java/org/airsonic/player/taglib/WikiTag.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.taglib; +package org.airsonic.player.taglib; import org.apache.commons.lang.StringEscapeUtils; import org.radeox.api.engine.RenderEngine; diff --git a/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeResolver.java b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeResolver.java index 2743e8f2..6f2e0bd5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeResolver.java +++ b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeResolver.java @@ -1,28 +1,28 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.theme; +package org.airsonic.player.theme; -import org.libresonic.player.domain.Theme; -import org.libresonic.player.domain.UserSettings; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.domain.Theme; +import org.airsonic.player.domain.UserSettings; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.springframework.web.servlet.ThemeResolver; import javax.servlet.http.HttpServletRequest; @@ -36,7 +36,7 @@ import java.util.Set; * * @author Sindre Mehus */ -public class LibresonicThemeResolver implements ThemeResolver { +public class CustomThemeResolver implements ThemeResolver { private SecurityService securityService; private SettingsService settingsService; @@ -49,14 +49,14 @@ public class LibresonicThemeResolver implements ThemeResolver { * @return The current theme name */ public String resolveThemeName(HttpServletRequest request) { - String themeId = (String) request.getAttribute("libresonic.theme"); + String themeId = (String) request.getAttribute("airsonic.theme"); if (themeId != null) { return themeId; } // Optimization: Cache theme in the request. themeId = doResolveThemeName(request); - request.setAttribute("libresonic.theme", themeId); + request.setAttribute("airsonic.theme", themeId); return themeId; } diff --git a/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java index 4c87239c..5ac408af 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java +++ b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.theme; +package org.airsonic.player.theme; -import org.libresonic.player.domain.Theme; -import org.libresonic.player.service.SettingsService; +import org.airsonic.player.domain.Theme; +import org.airsonic.player.service.SettingsService; import org.springframework.context.MessageSource; import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.ui.context.support.ResourceBundleThemeSource; @@ -31,7 +31,7 @@ import org.springframework.ui.context.support.ResourceBundleThemeSource; * * @author Sindre Mehus */ -public class LibresonicThemeSource extends ResourceBundleThemeSource { +public class CustomThemeSource extends ResourceBundleThemeSource { private SettingsService settingsService; private String basenamePrefix; diff --git a/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItem.java b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItem.java index 4531f031..2ab448b2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItem.java +++ b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItem.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.upload; +package org.airsonic.player.upload; import org.apache.commons.fileupload.disk.DiskFileItem; diff --git a/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItemFactory.java b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItemFactory.java index 94404dd3..5c5335cb 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItemFactory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItemFactory.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.upload; +package org.airsonic.player.upload; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.disk.DiskFileItemFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredOutputStream.java b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredOutputStream.java index 452b394e..5e7ec341 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredOutputStream.java +++ b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredOutputStream.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.upload; +package org.airsonic.player.upload; import java.io.IOException; import java.io.OutputStream; diff --git a/airsonic-main/src/main/java/org/airsonic/player/upload/UploadListener.java b/airsonic-main/src/main/java/org/airsonic/player/upload/UploadListener.java index 03defff7..92322b2b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/upload/UploadListener.java +++ b/airsonic-main/src/main/java/org/airsonic/player/upload/UploadListener.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.upload; +package org.airsonic.player.upload; /** * Extension of Commons FileUpload for monitoring the upload progress. diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/BoundedList.java b/airsonic-main/src/main/java/org/airsonic/player/util/BoundedList.java index bd61a130..f763d598 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/BoundedList.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/BoundedList.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.util; +package org.airsonic.player.util; import java.util.LinkedList; diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java index 2ea727ae..62413f19 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.util; +package org.airsonic.player.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/HttpRange.java b/airsonic-main/src/main/java/org/airsonic/player/util/HttpRange.java index 062fbc00..5aae4456 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/HttpRange.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/HttpRange.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.util; +package org.airsonic.player.util; import org.apache.commons.lang.StringUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/Pair.java b/airsonic-main/src/main/java/org/airsonic/player/util/Pair.java index fb9ef2aa..e6e58603 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/Pair.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/Pair.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.util; +package org.airsonic.player.util; import org.apache.commons.lang.ObjectUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java index 1f6b53be..564c8fd5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.util; +package org.airsonic.player.util; import org.apache.commons.codec.binary.Hex; import org.apache.commons.io.IOUtils; diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/Util.java b/airsonic-main/src/main/java/org/airsonic/player/util/Util.java index 9c8a6793..294d3fb4 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/Util.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/Util.java @@ -1,23 +1,23 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.util; +package org.airsonic.player.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -48,17 +48,17 @@ public final class Util { public static String getDefaultMusicFolder() { String def = isWindows() ? "c:\\music" : "/var/music"; - return System.getProperty("libresonic.defaultMusicFolder", def); + return System.getProperty("airsonic.defaultMusicFolder", def); } public static String getDefaultPodcastFolder() { String def = isWindows() ? "c:\\music\\Podcast" : "/var/music/Podcast"; - return System.getProperty("libresonic.defaultPodcastFolder", def); + return System.getProperty("airsonic.defaultPodcastFolder", def); } public static String getDefaultPlaylistFolder() { String def = isWindows() ? "c:\\playlists" : "/var/playlists"; - return System.getProperty("libresonic.defaultPlaylistFolder", def); + return System.getProperty("airsonic.defaultPlaylistFolder", def); } public static boolean isWindows() { diff --git a/airsonic-main/src/main/java/org/airsonic/player/validator/PasswordSettingsValidator.java b/airsonic-main/src/main/java/org/airsonic/player/validator/PasswordSettingsValidator.java index deac6a73..f9e4ee2e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/validator/PasswordSettingsValidator.java +++ b/airsonic-main/src/main/java/org/airsonic/player/validator/PasswordSettingsValidator.java @@ -1,26 +1,26 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.validator; +package org.airsonic.player.validator; -import org.libresonic.player.command.PasswordSettingsCommand; -import org.libresonic.player.controller.PasswordSettingsController; +import org.airsonic.player.command.PasswordSettingsCommand; +import org.airsonic.player.controller.PasswordSettingsController; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java b/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java index 57437a2c..72148b03 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java +++ b/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java @@ -1,29 +1,29 @@ /* - This file is part of Libresonic. + This file is part of Airsonic. - Libresonic is free software: you can redistribute it and/or modify + Airsonic 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, + Airsonic 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 . + along with Airsonic. If not, see . - Copyright 2016 (C) Libresonic Authors + Copyright 2016 (C) Airsonic Authors Based upon Subsonic, Copyright 2009 (C) Sindre Mehus */ -package org.libresonic.player.validator; +package org.airsonic.player.validator; +import org.airsonic.player.command.UserSettingsCommand; +import org.airsonic.player.controller.UserSettingsController; +import org.airsonic.player.service.SecurityService; +import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.libresonic.player.command.UserSettingsCommand; -import org.libresonic.player.controller.UserSettingsController; -import org.libresonic.player.service.SecurityService; -import org.libresonic.player.service.SettingsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; diff --git a/airsonic-main/src/main/resources/META-INF/spring.factories b/airsonic-main/src/main/resources/META-INF/spring.factories index e2d4d747..ae85c840 100644 --- a/airsonic-main/src/main/resources/META-INF/spring.factories +++ b/airsonic-main/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.context.ApplicationListener=\ - org.libresonic.player.spring.LoggingFileOverrideListener,\ - org.libresonic.player.security.LoginFailureListener + org.airsonic.player.spring.LoggingFileOverrideListener,\ + org.airsonic.player.security.LoginFailureListener diff --git a/airsonic-main/src/main/resources/application.properties b/airsonic-main/src/main/resources/application.properties index 97fe7d10..3ab7c4db 100644 --- a/airsonic-main/src/main/resources/application.properties +++ b/airsonic-main/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.mvc.view.prefix: /WEB-INF/jsp/ spring.mvc.view.suffix: .jsp server.error.includeStacktrace: ALWAYS logging.level.root=WARN -logging.level.org.libresonic=INFO +logging.level.org.airsonic=INFO logging.level.liquibase=INFO logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p){green} %clr(---){faint} %clr(%-40.40logger{32}){blue} %clr(:){faint} %m%n%wEx logging.pattern.file=%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- %-40.40logger{32} : %m%n%wEx diff --git a/airsonic-main/src/main/resources/applicationContext-cache.xml b/airsonic-main/src/main/resources/applicationContext-cache.xml index 3a33be97..3fb5806c 100644 --- a/airsonic-main/src/main/resources/applicationContext-cache.xml +++ b/airsonic-main/src/main/resources/applicationContext-cache.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/airsonic-main/src/main/resources/applicationContext-db-legacy.xml b/airsonic-main/src/main/resources/applicationContext-db-legacy.xml index 77b96a94..76b83afd 100644 --- a/airsonic-main/src/main/resources/applicationContext-db-legacy.xml +++ b/airsonic-main/src/main/resources/applicationContext-db-legacy.xml @@ -8,7 +8,7 @@ class="org.springframework.jdbc.datasource.DriverManagerDataSource"> - + diff --git a/airsonic-main/src/main/resources/applicationContext-db.xml b/airsonic-main/src/main/resources/applicationContext-db.xml index 8f87b2c2..c3e13b7c 100644 --- a/airsonic-main/src/main/resources/applicationContext-db.xml +++ b/airsonic-main/src/main/resources/applicationContext-db.xml @@ -13,12 +13,12 @@ - + - + @@ -26,13 +26,13 @@ - + - + diff --git a/airsonic-main/src/main/resources/applicationContext-service.xml b/airsonic-main/src/main/resources/applicationContext-service.xml index f301b806..1afc71de 100644 --- a/airsonic-main/src/main/resources/applicationContext-service.xml +++ b/airsonic-main/src/main/resources/applicationContext-service.xml @@ -11,71 +11,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -84,19 +84,19 @@ - + - + - + - + @@ -104,7 +104,7 @@ - + @@ -114,61 +114,61 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -176,7 +176,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -205,26 +205,26 @@ - - - - - - - + + + + + + + - + - + - + - + @@ -233,35 +233,35 @@ - + - - + + - + - + - + - + @@ -278,7 +278,7 @@ - + @@ -288,32 +288,32 @@ - + - + - + - + - + - + - + diff --git a/airsonic-main/src/main/resources/applicationContext-sonos.xml b/airsonic-main/src/main/resources/applicationContext-sonos.xml index b3157491..0d5adfa6 100644 --- a/airsonic-main/src/main/resources/applicationContext-sonos.xml +++ b/airsonic-main/src/main/resources/applicationContext-sonos.xml @@ -9,11 +9,11 @@ - + - + diff --git a/airsonic-main/src/main/resources/ehcache.xml b/airsonic-main/src/main/resources/ehcache.xml index 1f4950df..82db6a56 100644 --- a/airsonic-main/src/main/resources/ehcache.xml +++ b/airsonic-main/src/main/resources/ehcache.xml @@ -69,7 +69,7 @@ used with JMX monitors. Subdirectories can be specified below the property e.g. java.io.tmpdir/one --> - + diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml index ba176727..dd41501f 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml @@ -218,7 +218,7 @@ - + @@ -233,7 +233,7 @@ - + diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml index 5a053df4..e0efd06e 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml @@ -19,7 +19,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties index 9e11cd4d..d89b8955 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties @@ -45,7 +45,7 @@ top.more = \u041E\u0449\u0435 top.help = \u041E\u0442\u043D\u043E\u0441\u043D\u043E top.search = \u0422\u044A\u0440\u0441\u0435\u043D\u0435 top.upgrade = \u041D\u0430\u043B\u0438\u0447\u043D\u0430 \u0435 \u043D\u043E\u0432\u0430 \u0432\u0435\u0440\u0441\u0438\u044F. \u0421\u0432\u0430\u043B\u0438 {0} {1} \ - \u0442\u0443\u043A. + \u0442\u0443\u043A. top.missing = \u041D\u044F\u043C\u0430 \u043D\u0430\u043B\u0438\u0447\u043D\u0438 \u043F\u0430\u043F\u043A\u0438 \u0441 \u043C\u0443\u0437\u0438\u043A\u0430. \u041C\u043E\u043B\u044F \u043F\u0440\u043E\u043C\u0435\u043D\u0435\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435. top.logout = \u0418\u0437\u043B\u0435\u0437 {0} @@ -113,9 +113,9 @@ search.hits.songs = \u041F\u0435\u0441\u043D\u0438 # gettingStarted.jsp gettingStarted.title = \u0414\u0430 \u0437\u0430\u043F\u043E\u0447\u0432\u0430\u043C\u0435 -gettingStarted.text =

\u0414\u043E\u0431\u0440\u0435 \u0434\u043E\u0448\u043B\u0438 \u0432 Libresonic! \u0422\u0440\u044F\u0431\u0432\u0430\u0442 \u0441\u0430\u043C\u043E \u043E\u0449\u0435 \u043D\u044F\u043A\u043E\u043B\u043A\u043E \u0431\u044A\u0440\u0437\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438, \u043F\u0440\u043E\u0441\u0442\u043E \u0441\u043B\u0435\u0434\u0432\u0430\u0439\u0442\u0435 \u0441\u0442\u044A\u043F\u043A\u0438\u0442\u0435 \u043E\u043F\u0438\u0441\u0430\u043D\u0438 \u043F\u043E-\u0434\u043E\u043B\u0443.
\ +gettingStarted.text =

\u0414\u043E\u0431\u0440\u0435 \u0434\u043E\u0448\u043B\u0438 \u0432 Airsonic! \u0422\u0440\u044F\u0431\u0432\u0430\u0442 \u0441\u0430\u043C\u043E \u043E\u0449\u0435 \u043D\u044F\u043A\u043E\u043B\u043A\u043E \u0431\u044A\u0440\u0437\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438, \u043F\u0440\u043E\u0441\u0442\u043E \u0441\u043B\u0435\u0434\u0432\u0430\u0439\u0442\u0435 \u0441\u0442\u044A\u043F\u043A\u0438\u0442\u0435 \u043E\u043F\u0438\u0441\u0430\u043D\u0438 \u043F\u043E-\u0434\u043E\u043B\u0443.
\ \u041D\u0430\u0442\u0438\u0441\u043D\u0435\u0442\u0435 \u0431\u0443\u0442\u043E\u043D\u0430 "\u041D\u0430\u0447\u0430\u043B\u043E" \u0432 \u043B\u0435\u043D\u0442\u0430\u0442\u0430 \u0433\u043E\u0440\u0435, \u0437\u0430 \u0434\u0430 \u0441\u0435 \u0432\u044A\u0440\u043D\u0435\u0442\u0435 \u043F\u043E \u0432\u0441\u044F\u043A\u043E \u0432\u0440\u0435\u043C\u0435 \u043A\u044A\u043C \u0442\u043E\u0437\u0438 \u0435\u043A\u0440\u0430\u043D.

\ -

\u0417\u0430 \u043F\u043E\u0432\u0435\u0447\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F, \u043C\u043E\u043B\u044F \u043F\u0440\u043E\u0447\u0435\u0442\u0435\u0442\u0435 \u0420\u044A\u043A\u043E\u0432\u043E\u0434\u0441\u0442\u0432\u043E\u0442\u043E \u0437\u0430 \u043D\u043E\u0432\u0438 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438.

+

\u0417\u0430 \u043F\u043E\u0432\u0435\u0447\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F, \u043C\u043E\u043B\u044F \u043F\u0440\u043E\u0447\u0435\u0442\u0435\u0442\u0435 \u0420\u044A\u043A\u043E\u0432\u043E\u0434\u0441\u0442\u0432\u043E\u0442\u043E \u0437\u0430 \u043D\u043E\u0432\u0438 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438.

gettingStarted.step1.title = \u041F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u0430 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0441\u043A\u0430\u0442\u0430 \u043F\u0430\u0440\u043E\u043B\u0430. gettingStarted.step1.text = \u0417\u0430\u0449\u0438\u0442\u0435\u0442\u0435 \u0432\u0430\u0448\u0438\u044F\u0442 \u0441\u044A\u0440\u0432\u044A\u0440 \u043A\u0430\u0442\u043E \u0441\u043C\u0435\u043D\u0438\u0442\u0435 \u043F\u0430\u0440\u043E\u043B\u0430\u0442\u0430 \u043F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435 \u0441 \u0432\u0430\u0448\u0430 \u043F\u0430\u0440\u043E\u043B\u0430 \u0437\u0430 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0441\u043A\u0438\u044F \u043F\u0440\u043E\u0444\u0438\u043B. \ \u041C\u043E\u0436\u0435\u0442\u0435 \u0441\u044A\u0449\u043E \u0442\u0430\u043A\u0430 \u0434\u0430 \u0441\u044A\u0437\u0434\u0430\u0432\u0430\u0442\u0435 \u043D\u043E\u0432\u0438 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u0438 \u043F\u0440\u043E\u0444\u0438\u043B\u0438 \u0441 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438 \u043F\u0440\u0430\u0432\u0430. @@ -160,8 +160,8 @@ more.random.year = \u0438 \u0433\u043E\u0434\u0438\u043D\u0430 more.random.anyyear = \u0411\u0435\u0437 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 more.random.folder = \u043E\u0442 \u043F\u0430\u043F\u043A\u0430 more.random.anyfolder = \u0411\u0435\u0437 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 -more.apps.title = Libresonic \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F -more.apps.text =

Libresonic \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\u0442\u0430 \u0441\u0430 \u043F\u0440\u0435\u0434\u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438 \u0437\u0430 Android, iPhone, \ +more.apps.title = Airsonic \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F +more.apps.text =

Airsonic \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\u0442\u0430 \u0441\u0430 \u043F\u0440\u0435\u0434\u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438 \u0437\u0430 Android, iPhone, \ Windows Phone \u0438 AIR.

more.mobile.title = \u041C\u043E\u0431\u0438\u043B\u043D\u0438 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430 more.mobile.text =

\u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0443\u043F\u0440\u0430\u0432\u043B\u044F\u0432\u0430\u0442\u0435 {0} \u043E\u0442 \u0432\u0441\u0435\u043A\u0438 WAP-\u0441\u044A\u0432\u043C\u0435\u0441\u0442\u0438\u043C \u043C\u043E\u0431\u0438\u043B\u0435\u043D \u0442\u0435\u043B\u0435\u0444\u043E\u043D \u0438\u043B\u0438 PDA.
\ @@ -189,13 +189,13 @@ upload.unzipped = \u0420\u0430\u0437\u0430\u0440\u0445\u0438\u0432\u0438\u0440\u # help.jsp help.title = \u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0437\u0430 {0} help.upgrade = \u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435! \u041D\u0430\u043B\u0438\u0447\u043D\u0430 \u0435 \u043D\u043E\u0432\u0430 \u0432\u0435\u0440\u0441\u0438\u044F. \u0421\u0432\u0430\u043B\u0438 \u043E\u0442 {0} {1} \ - \u0442\u0443\u043A. + \u0442\u0443\u043A. help.version.title = \u0412\u0435\u0440\u0441\u0438\u044F help.builddate.title = \u041E\u0442 \u0434\u0430\u0442\u0430 help.server.title = \u0421\u044A\u0440\u0432\u044A\u0440 help.license.title = \u0423\u0441\u043B\u043E\u0432\u0438\u044F \u0437\u0430 \u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0435 help.license.text = {0} \u0435 \u0431\u0435\u0437\u043F\u043B\u0430\u0442\u0435\u043D \u0441\u043E\u0444\u0442\u0443\u0435\u0440, \u0440\u0430\u0437\u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u044F\u0432\u0430\u043D \u0447\u0440\u0435\u0437 GPL \u043B\u0438\u0446\u0435\u043D\u0437 \u0441 \u043E\u0442\u0432\u043E\u0440\u0435\u043D \u043A\u043E\u0434. \ - {0} \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430 \u043B\u0438\u0446\u0435\u043D\u0437\u0438\u0440\u0430\u043D\u0438 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043D\u0430 \u0442\u0440\u0435\u0442\u0438 \u0441\u0442\u0440\u0430\u043D\u0438. \u041C\u043E\u043B\u044F \u043E\u0431\u044A\u0440\u043D\u0435\u0442\u0435 \u0432\u043D\u0438\u043C\u0430\u043D\u0438\u0435, \u0447\u0435 {0} \u043D\u0435 \u0435 \ + {0} \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430 \u043B\u0438\u0446\u0435\u043D\u0437\u0438\u0440\u0430\u043D\u0438 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043D\u0430 \u0442\u0440\u0435\u0442\u0438 \u0441\u0442\u0440\u0430\u043D\u0438. \u041C\u043E\u043B\u044F \u043E\u0431\u044A\u0440\u043D\u0435\u0442\u0435 \u0432\u043D\u0438\u043C\u0430\u043D\u0438\u0435, \u0447\u0435 {0} \u043D\u0435 \u0435 \ \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442 \u0437\u0430 \u043D\u0435\u043B\u0435\u0433\u0430\u043B\u043D\u043E \u0440\u0430\u0437\u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u043D\u0430 \u0437\u0430\u0449\u0438\u0442\u0435\u043D\u0438 \u0441 \u0430\u0432\u0442\u043E\u0440\u0441\u043A\u043E \u043F\u0440\u0430\u0432\u043E \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0438. \u0412\u0438\u043D\u0430\u0433\u0438 \u0441\u043F\u0430\u0437\u0432\u0430\u0439\u0442\u0435 \u0437\u0430\u043A\u043E\u043D\u0438\u0442\u0435, \u0441\u043F\u0435\u0446\u0438\u0444\u0438\u0447\u043D\u0438 \u0437\u0430 \u0432\u0430\u0448\u0430\u0442\u0430 \u0434\u044A\u0440\u0436\u0430\u0432\u0430. help.homepage.title = \u041E\u0444\u0438\u0446\u0438\u0430\u043B\u0435\u043D \u0441\u0430\u0439\u0442 help.forum.title = \u0424\u043E\u0440\u0443\u043C @@ -204,7 +204,7 @@ help.contact.title = \u041A\u043E\u043D\u0442\u0430\u043A\u0442 help.contact.text = {0} \u0435 \u0441\u044A\u0437\u0434\u0430\u0434\u0435\u043D \u0438 \u0441\u0435 \u043F\u043E\u0434\u0434\u044A\u0440\u0436\u0430 \u043E\u0442 Sindre Mehus \ (sindre@activeobjects.no). \ \u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438 \u0438\u043B\u0438 \u043F\u0440\u0435\u0434\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0437\u0430 \u043F\u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F, \u043C\u043E\u043B\u044F \u043F\u043E\u0441\u0435\u0442\u0435\u0442\u0435 \ - Libresonic \u0424\u043E\u0440\u0443\u043C. + Airsonic \u0424\u043E\u0440\u0443\u043C. help.log = \u041B\u043E\u0433 \u0444\u0430\u0439\u043B\u043E\u0432\u0435 help.logfile = \u0426\u0435\u043B\u0438\u044F\u0442 \u043B\u043E\u0433 \u0435 \u0437\u0430\u043F\u0430\u0437\u0435\u043D \u0432 {0}. @@ -322,7 +322,7 @@ transcodingsettings.info =

(%s = \u0424\u0430\u0439\u043B\u044 \u043D\u0435 \u0438\u0437\u0438\u0441\u043A\u0432\u0430 \u0434\u043E\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B\u043D\u043E \u0434\u0438\u0441\u043A\u043E\u0432\u043E \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u043E.

\

\u0424\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0442\u043E \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u0430\u043D\u0435 \u0441\u0435 \u0438\u0437\u0432\u044A\u0440\u0448\u0432\u0430 \u043E\u0442 \u043A\u043E\u043D\u0437\u043E\u043B\u043D\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u043D\u0430 \u0442\u0440\u0435\u0442\u0438 \u0441\u0442\u0440\u0430\u043D\u0438, \u043A\u043E\u0438\u0442\u043E \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0441\u0430 \u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u0438 \u0432 {0}. \ \u041A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u0430\u0449 \u043F\u0430\u043A\u0435\u0442 \u0437\u0430 Windows \ - \u0435 \u0434\u043E\u0441\u0442\u044A\u043F\u0435\u043D \u0442\u0443\u043A. \u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u0435 \u0432\u0430\u0448 \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u043E\u0440, \u0430\u043A\u043E \u0438\u0437\u043F\u044A\u043B\u043D\u044F\u0432\u0430 \ + \u0435 \u0434\u043E\u0441\u0442\u044A\u043F\u0435\u043D \u0442\u0443\u043A. \u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u0435 \u0432\u0430\u0448 \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u043E\u0440, \u0430\u043A\u043E \u0438\u0437\u043F\u044A\u043B\u043D\u044F\u0432\u0430 \ \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0438\u0437\u0438\u0441\u043A\u0432\u0430\u043D\u0438\u044F: \

    \
  • \u0422\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u043F\u0440\u0438\u0442\u0435\u0436\u0430\u0432\u0430 \u043A\u043E\u043D\u0437\u043E\u043B\u0435\u043D \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441.
    • \ @@ -372,8 +372,8 @@ playersettings.technology.jukebox.title = \u0414\u0436\u0443\u0431\u043E\u043A\u playersettings.technology.web.text = \u0421\u043B\u0443\u0448\u0430\u0439\u0442\u0435 \u043C\u0443\u0437\u0438\u043A\u0430\u0442\u0430 \u0434\u0438\u0440\u0435\u043A\u0442\u043D\u043E \u0432 \u0431\u0440\u0430\u0443\u0437\u044A\u0440\u0430, \u0447\u0440\u0435\u0437 \u0438\u043D\u0442\u0435\u0433\u0440\u0438\u0440\u0430\u043D\u0438\u044F \u0444\u043B\u0430\u0448 \u043F\u043B\u0435\u044A\u0440. playersettings.technology.external.text = \u0421\u043B\u0443\u0448\u0430\u0439\u0442\u0435 \u043C\u0443\u0437\u0438\u043A\u0430\u0442\u0430 \u0432 \u043B\u044E\u0431\u0438\u043C\u0438\u044F \u0441\u0438 \u043F\u043B\u0435\u0439\u044A\u0440, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 \u0432 WinAmp \u0438\u043B\u0438 Windows Media Player. playersettings.technology.external_with_playlist.text = \u0421\u044A\u0449\u043E \u043A\u0430\u0442\u043E \u043F\u043E-\u0433\u043E\u0440\u0435, \u043D\u043E \u043F\u043B\u0435\u0439\u043B\u0438\u0441\u0442\u0430\u0442\u0430 \u0441\u0435 \u0443\u043F\u0440\u0430\u0432\u043B\u044F\u0432\u0430 \u043E\u0442 \u043F\u043B\u0435\u044A\u0440\u0430, \ - \u0430 \u043D\u0435 \u043E\u0442 Libresonic \u0441\u044A\u0440\u0432\u044A\u0440\u0430. \u0412 \u0442\u043E\u0437\u0438 \u0440\u0435\u0436\u0438\u043C \u0435 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E \u043D\u0430\u043A\u044A\u0441\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0435\u0441\u043D\u0438\u0442\u0435. -playersettings.technology.jukebox.text = \u0421\u043B\u0443\u0448\u0430\u0439\u0442\u0435 \u043C\u0443\u0437\u0438\u043A\u0430\u0442\u0430 \u0434\u0438\u0440\u0435\u043A\u0442\u043D\u043E \u0447\u0440\u0435\u0437 \u0430\u0443\u0434\u0438\u043E \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E \u043D\u0430 Libresonic \u0441\u044A\u0440\u0432\u044A\u0440\u0430. (\u0421\u0430\u043C\u043E \u0437\u0430 \u043E\u0442\u043E\u0440\u0438\u0437\u0438\u0440\u0430\u043D\u0438 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438). + \u0430 \u043D\u0435 \u043E\u0442 Airsonic \u0441\u044A\u0440\u0432\u044A\u0440\u0430. \u0412 \u0442\u043E\u0437\u0438 \u0440\u0435\u0436\u0438\u043C \u0435 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E \u043D\u0430\u043A\u044A\u0441\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0435\u0441\u043D\u0438\u0442\u0435. +playersettings.technology.jukebox.text = \u0421\u043B\u0443\u0448\u0430\u0439\u0442\u0435 \u043C\u0443\u0437\u0438\u043A\u0430\u0442\u0430 \u0434\u0438\u0440\u0435\u043A\u0442\u043D\u043E \u0447\u0440\u0435\u0437 \u0430\u0443\u0434\u0438\u043E \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E \u043D\u0430 Airsonic \u0441\u044A\u0440\u0432\u044A\u0440\u0430. (\u0421\u0430\u043C\u043E \u0437\u0430 \u043E\u0442\u043E\u0440\u0438\u0437\u0438\u0440\u0430\u043D\u0438 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438). playersettings.name = \u0418\u043C\u0435 \u043D\u0430 \u043F\u043B\u0435\u044A\u0440\u0430 playersettings.coverartsize = \u0420\u0430\u0437\u043C\u0435\u0440 \u043D\u0430 \u043E\u0431\u043B\u043E\u0436\u043A\u0438\u0442\u0435 playersettings.maxbitrate = \u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u0435\u043D \u0431\u0438\u0442\u0440\u0435\u0439\u0442 diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties index 640d34dc..e964cd0f 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties @@ -45,7 +45,7 @@ top.more = M\u00E9s top.help = Ajuda top.search = Buscar top.upgrade = Una nova versi\u00F3 est\u00E0 disponible. Descarregar {0} {1} \ - aqu\u00ED. + aqu\u00ED. top.missing = No s'ha trobat cap directori. Si us plau, canvi\u00EF la configuraci\u00F3. top.logout = Desconnectar {0} @@ -132,14 +132,14 @@ search.hits.songs = Can\u00E7ons # gettingStarted.jsp gettingStarted.title = Primers passos -gettingStarted.text =

    Benvingut a Libresonic! Per tal de configurar el programa de la manera m\u00E9s r\u00E0pida possible, nom\u00E9s cal que segueixi els seg\u00FCent passos.
    \ +gettingStarted.text =

    Benvingut a Airsonic! Per tal de configurar el programa de la manera m\u00E9s r\u00E0pida possible, nom\u00E9s cal que segueixi els seg\u00FCent passos.
    \ Cliqui al bot\u00F3 d''Inici que hi ha a la barra superior per tal de tornar a aquesta p\u00E0gina.

    \ -

    Per a m\u00E9s informaci\u00F3, consulti la p\u00E0gina la guia Getting started.

    +

    Per a m\u00E9s informaci\u00F3, consulti la p\u00E0gina la guia Getting started.

    gettingStarted.step1.title = Canviar la contrasenya de l'administrador. gettingStarted.step1.text = Per tal de fer m\u00E9s segur el seu servidor es recomana canviar la contrasenya per defecte de l''administrador. \ Tamb\u00E9 pot crear comptes d'usuari nous amb diferents privilegis associats. gettingStarted.step2.title = Configuri els directoris multim\u00E8dia. -gettingStarted.step2.text = Indiqui a Libresonic a on guarda els arxius de m\u00FAsica i de v\u00EDdeo. +gettingStarted.step2.text = Indiqui a Airsonic a on guarda els arxius de m\u00FAsica i de v\u00EDdeo. gettingStarted.hide = No mostrar aquest missatge de nou gettingStarted.hidealert = Per tal de tornar a mostrar aquest missatge, accedeixi a Configuraci\u00F3 > General. @@ -179,8 +179,8 @@ more.random.year = i any more.random.anyyear = Qualsevol more.random.folder = i directori more.random.anyfolder = Qualsevol -more.apps.title = Libresonic Apps -more.apps.text =

    Hi ha aplicacions de Libresonic disponibles per a Android, iPhone, \ +more.apps.title = Airsonic Apps +more.apps.text =

    Hi ha aplicacions de Airsonic disponibles per a Android, iPhone, \ Windows Phone 7 i AIR.

    more.mobile.title = Tel\u00E8fon m\u00F2bil more.mobile.text =

    Vost\u00E8 pot controlar {0} amb qualsevol m\u00F2bil que tingui el WAP activat o amb una PDA.
    \ @@ -209,13 +209,13 @@ upload.unzipped = Descomprimit {0} # help.jsp help.title = Quant a {0} help.upgrade = Avis! Una nova versi\u00F3 est\u00E0 disponible.
    Descarregar {0} {1} \ - aqu\u00ED. + aqu\u00ED. help.version.title = Versi\u00F3 help.builddate.title = Data de creaci\u00F3 help.server.title = Server help.license.title = Llic\u00E8ncia help.license.text = {0} es software lliure distribu\u00EFt sota llic\u00E8ncia de codi obert GPL. \ - {0} usa llibreries de tercers sota les respectives llic\u00E8ncies. Si us plau, noti que {0} NO \ + {0} usa llibreries de tercers sota les respectives llic\u00E8ncies. Si us plau, noti que {0} NO \ \u00E9s una eina per a la distribuci\u00F3 il\u00B7legal de material amb copyright. Prengui atenci\u00F3 a les lleis espec\u00EDfiques del seu pa\u00EDs envers aquest punt. help.homepage.title = P\u00E0gina web del projecte help.forum.title = F\u00F2rum @@ -224,7 +224,7 @@ help.contact.title = Contacte help.contact.text = {0} est\u00E0 desenvolupat i mantingut per Sindre Mehus \ (sindre@activeobjects.no). \ Si vost\u00E8 t\u00E9 alguna pregunta, comentari o suggeriment, si us plau visiti \ - Libresonic Forum. + Airsonic Forum. help.log = Log help.logfile = El log complet esta guardat a {0}. @@ -355,7 +355,7 @@ transcodingsettings.info =

    (%s = el format de l'arxiu que vole necessita espai de disc extra.

    \

    El canvi de format es realitza mitjan\u00E7ant programes de l\u00EDnia de comandes de tercers els quals s'han de trobar instal\u00B7lats en {0}. \ Un paquet de windows pel canvi de format \ - est\u00E0 disponible aqu\u00ED. Vost\u00E8 pot afegir el seu propi programa \ + est\u00E0 disponible aqu\u00ED. Vost\u00E8 pot afegir el seu propi programa \ si compleix els seg\u00FCent requisits: \

      \
    • Ha de tenir una interf\u00EDcie de l\u00EDnia de comandes.
      • \ @@ -403,8 +403,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Reprodueixi m\u00FAsica directament a un navegador web usant Flash player integrat. playersettings.technology.external.text = Reprodueixi m\u00FAsica al seu reproductor preferit com ara WinAmp o Windows Media Player. playersettings.technology.external_with_playlist.text = El mateix que el cas anterior per\u00F2 la llista de reproducci\u00F3 es controla pel reproductor enlloc \ - del servidor Libresonic. En aquest mode saltar-se can\u00E7ons \u00E9s possible. -playersettings.technology.jukebox.text = Reprodueixi m\u00FAsica directament a un aparell d''\u00E0udio de Libresonic. (Nom\u00E9s usuaris autoritzats). + del servidor Airsonic. En aquest mode saltar-se can\u00E7ons \u00E9s possible. +playersettings.technology.jukebox.text = Reprodueixi m\u00FAsica directament a un aparell d''\u00E0udio de Airsonic. (Nom\u00E9s usuaris autoritzats). playersettings.name = Nom de l'oient playersettings.coverartsize = Mida de la car\u00E0tula playersettings.maxbitrate = Bitrate m\u00E0xim @@ -544,7 +544,7 @@ share.facebook = Share on Facebook share.twitter = Share on Twitter share.googleplus = Share on Google+ share.link = Or share this with someone by sending them this link: {0} -share.disabled = To share your music with someone you must first register your own libresonic.org address.
      \ +share.disabled = To share your music with someone you must first register your own airsonic.org address.
      \ Please go to Settings > Network (administrative rights required). share.manage = Manage my shared media diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties index 7c7f6608..ee9a6a0b 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties @@ -68,7 +68,7 @@ top.more = V\u00EDce top.help = N\u00E1pov\u011Bda top.search = Hledat top.upgrade = Je dostupn\u00E1 nov\u00E1 verze. St\u00E1hnout {0} {1} \ - zde. + zde. top.missing = Nebyly nalezeny \u017E\u00E1dn\u00E9 slo\u017Eky m\u00E9di\u00ED. Zm\u011B\u0148te nastaven\u00ED. top.logout = Odhl\u00E1sit u\u017Eivatele {0} @@ -166,11 +166,11 @@ search.hits.songs = Skladby # gettingStarted.jsp gettingStarted.title = Za\u010D\u00EDn\u00E1me -gettingStarted.text =

      V\u00EDt\u00E1 v\u00E1s Libresonic! Nastaven\u00ED bude provedeno b\u011Bhem p\u00E1r okam\u017Eik\u016F, postupujte podle n\u00ED\u017Ee uveden\u00FDch jednoduch\u00FDch krok\u016F.
      \ +gettingStarted.text =

      V\u00EDt\u00E1 v\u00E1s Airsonic! Nastaven\u00ED bude provedeno b\u011Bhem p\u00E1r okam\u017Eik\u016F, postupujte podle n\u00ED\u017Ee uveden\u00FDch jednoduch\u00FDch krok\u016F.
      \ Pro n\u00E1vrat na tuto obrazovku klikn\u011Bte na tla\u010D\u00EDtko "Dom\u016F" v n\u00E1strojov\u00E9 li\u0161t\u011B naho\u0159e.

      \ -

      Pro v\u00EDce informac\u00ED si p\u0159e\u010Dt\u011Bte p\u0159\u00EDru\u010Dku Za\u010D\u00EDn\u00E1me (v anglick\u00E9m jazyce).

      -gettingStarted.root = Upozorn\u011Bn\u00ED! Proces Libresonic b\u011B\u017E\u00ED jako u\u017Eivatel root. Uva\u017Eujte o \ - zm\u011Bn\u011B. +

      Pro v\u00EDce informac\u00ED si p\u0159e\u010Dt\u011Bte p\u0159\u00EDru\u010Dku Za\u010D\u00EDn\u00E1me (v anglick\u00E9m jazyce).

      +gettingStarted.root = Upozorn\u011Bn\u00ED! Proces Airsonic b\u011B\u017E\u00ED jako u\u017Eivatel root. Uva\u017Eujte o \ + zm\u011Bn\u011B. gettingStarted.step1.title = Zm\u011B\u0148te heslo spr\u00E1vce. gettingStarted.step1.text = Zabezpe\u010Dte si sv\u016Fj server zm\u011Bnou v\u00FDchoz\u00EDho hesla pro \u00FA\u010Det administr\u00E1tora. \ M\u016F\u017Eete tak\u00E9 vytvo\u0159it nov\u00E9 \u00FA\u010Dty u\u017Eivatel\u016F s rozd\u00EDln\u00FDmi opr\u00E1vn\u011Bn\u00EDmi. @@ -223,8 +223,8 @@ more.random.year = a roku more.random.anyyear = Jak\u00FDkoliv more.random.folder = ve slo\u017Ece more.random.anyfolder = Jak\u00E1koliv -more.apps.title = Aplikace Libresonicu -more.apps.text =

      Vyzkou\u0161ejte neust\u00E1le rostouc\u00ED seznam aplikac\u00ED Libresonicu. \ +more.apps.title = Aplikace Airsonicu +more.apps.text =

      Vyzkou\u0161ejte neust\u00E1le rostouc\u00ED seznam aplikac\u00ED Airsonicu. \ Poskytuj\u00ED z\u00E1bavu a alternativn\u00ED zp\u016Fsoby, jak si u\u017E\u00EDt svou sb\u00EDrku m\u00E9di\u00ED - bez ohledu na to, kde se nach\u00E1z\u00EDte. \ Aplikace jsou dostupn\u00E9 pro Android, iPhone, Windows Phone, BlackBerry, Roku a spoustu dal\u0161\u00EDch.

      more.mobile.title = Mobiln\u00ED telefon @@ -253,13 +253,13 @@ upload.unzipped = Rozbaleno {0} # help.jsp help.title = O aplikaci {0} help.upgrade = Pozor! Je dostupn\u00E1 nov\u00E1 verze. St\u00E1hnout {0} {1} \ - zde. + zde. help.version.title = Verze help.builddate.title = Datum sestaven\u00ED help.server.title = Server help.license.title = Podm\u00EDnky pou\u017Eit\u00ED help.license.text = {0} je software distribuovan\u00FD pod GPL open-source licenc\u00ED. \ - {0} pou\u017E\u00EDv\u00E1 licencovan\u00E9 knihovny t\u0159et\u00EDch stran. Uv\u011Bdomte si, \u017Ee {0} nen\u00ED \ + {0} pou\u017E\u00EDv\u00E1 licencovan\u00E9 knihovny t\u0159et\u00EDch stran. Uv\u011Bdomte si, \u017Ee {0} nen\u00ED \ n\u00E1stroj pro neleg\u00E1ln\u00ED distribuci materi\u00E1lu chr\u00E1n\u011Bn\u00E9ho autorsk\u00FDmi pr\u00E1vy. V\u017Edy v\u011Bnujte pozornost a dodr\u017Eujte p\u0159\u00EDslu\u0161n\u00E9 z\u00E1kony va\u0161\u00ED zem\u011B. help.homepage.title = Domovsk\u00E1 str\u00E1nka help.forum.title = F\u00F3rum @@ -268,7 +268,7 @@ help.contact.title = Kontakt help.contact.text = {0} je vyv\u00EDjen a udr\u017Eov\u00E1n Sindrem Mehusem \ (sindre@activeobjects.no). \ Jestli\u017Ee m\u00E1te jak\u00FDkoliv dotaz, p\u0159ipom\u00EDnku nebo n\u00E1m\u011Bt na zlep\u0161en\u00ED, nav\u0161tivte \ - f\u00F3rum Libresonicu. + f\u00F3rum Airsonicu. help.log = Protokol help.logfile = Kompletn\u00ED protokol je ulo\u017Een v {0}. @@ -382,7 +382,7 @@ musicfoldersettings.fastcache = Re\u017Eim rychl\u00E9ho p\u0159\u00EDstupu musicfoldersettings.fastcache.description = Pou\u017Eijte tuto volbu pro minimalizaci p\u0159\u00EDstupu k disku, nap\u0159\u00EDklad pokud jsou va\u0161e soubory m\u00E9di\u00ED na s\u00ED\u0165ov\u00E9m disku. \ Pozn\u00E1mka: Zm\u011Bny soubor\u016F budou viditeln\u00E9 a\u017E po prohled\u00E1n\u00ED slo\u017Eek m\u00E9di\u00ED. musicfoldersettings.expunge = Vy\u010Distit datab\u00E1zi -musicfoldersettings.expunge.description = Libresonic ukl\u00E1d\u00E1 informace o v\u0161ech minul\u00FDch souborech m\u00E9di\u00ED. Vy\u010Di\u0161t\u011Bn\u00EDm datab\u00E1ze budou trvale odebr\u00E1ny informace \ +musicfoldersettings.expunge.description = Airsonic ukl\u00E1d\u00E1 informace o v\u0161ech minul\u00FDch souborech m\u00E9di\u00ED. Vy\u010Di\u0161t\u011Bn\u00EDm datab\u00E1ze budou trvale odebr\u00E1ny informace \ o souborech, kter\u00E9 ji\u017E nejsou ve va\u0161\u00ED sb\u00EDrce m\u00E9di\u00ED. musicfoldersettings.organizebyfolderstructure = Organizovat podle structury slo\u017Eek musicfoldersettings.organizebyfolderstructure.description = Tuto volbu pou\u017Eijte pro proch\u00E1zen\u00ED knihovny m\u00E9di\u00ED pomoc\u00ED adres\u00E1\u0159ov\u00E9 struktury ne\u017E pomoc\u00ED informac\u00ED o interpretech nebo albech v ID3 taz\u00EDch. @@ -453,8 +453,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = P\u0159ehr\u00E1v\u00E1 hudbu p\u0159\u00EDmo v prohl\u00ED\u017Ee\u010Di pomoc\u00ED integrovan\u00E9ho p\u0159ehr\u00E1va\u010De Flash player. playersettings.technology.external.text = P\u0159ehr\u00E1v\u00E1 hudbu ve va\u0161em obl\u00EDben\u00E9m p\u0159ehr\u00E1va\u010Di jako je WinAmp nebo Windows Media Player. playersettings.technology.external_with_playlist.text = Stejn\u011B jako p\u0159edchoz\u00ED, ale seznam stop je spravov\u00E1n p\u0159ehr\u00E1va\u010Dem \ - a ne serverem Libresonic. V tomto re\u017Eimu je mo\u017En\u00E9 p\u0159eskakovat uvnit\u0159 skladeb. -playersettings.technology.jukebox.text = P\u0159ehr\u00E1v\u00E1 hudbu p\u0159\u00EDmo na zvukov\u00E9m za\u0159\u00EDzen\u00ED serveru Libresonic (Pouze schv\u00E1len\u00ED u\u017Eivatel\u00E9). + a ne serverem Airsonic. V tomto re\u017Eimu je mo\u017En\u00E9 p\u0159eskakovat uvnit\u0159 skladeb. +playersettings.technology.jukebox.text = P\u0159ehr\u00E1v\u00E1 hudbu p\u0159\u00EDmo na zvukov\u00E9m za\u0159\u00EDzen\u00ED serveru Airsonic (Pouze schv\u00E1len\u00ED u\u017Eivatel\u00E9). playersettings.name = N\u00E1zev p\u0159ehr\u00E1va\u010De playersettings.coverartsize = Velikost obalu alba playersettings.maxbitrate = Maxim\u00E1ln\u00ED p\u0159enosov\u00E1 rychlost @@ -471,7 +471,7 @@ playersettings.forget = Odstranit p\u0159ehr\u00E1va\u010D playersettings.clone = Klonovat p\u0159ehr\u00E1va\u010D dlnasettings.enabled = Povolit server DLNA -dlnasettings.description = Pou\u017Eijte tuto volbu k zapnut\u00ED medi\u00E1ln\u00EDho serveru DLNA nebo UPnP v Libresonicu \ +dlnasettings.description = Pou\u017Eijte tuto volbu k zapnut\u00ED medi\u00E1ln\u00EDho serveru DLNA nebo UPnP v Airsonicu \ a streamujte sv\u00E1 m\u00E9dia do kompatibiln\u00EDch p\u0159ehr\u00E1va\u010D\u016F DLNA. # shareSettings.jsp @@ -602,7 +602,7 @@ share.facebook = Sd\u00EDlet na Facebooku share.twitter = Sd\u00EDlet na Twiteru share.googleplus = Sd\u00EDlet na Google+ share.link = Nebo sd\u00EDlejte s k\u00FDmkoliv posl\u00E1n\u00EDm tohoto odkazu: {0} -share.disabled = Abyste s n\u011Bk\u00FDm mohli sd\u00EDlet svou hudbu, mus\u00EDte si nejd\u0159\u00EDv zaregistrovat vlastn\u00ED adresu na libresonic.org.
      \ +share.disabled = Abyste s n\u011Bk\u00FDm mohli sd\u00EDlet svou hudbu, mus\u00EDte si nejd\u0159\u00EDv zaregistrovat vlastn\u00ED adresu na airsonic.org.
      \ P\u0159ejd\u011Bte na Nastaven\u00ED > S\u00ED\u0165 (jsou vy\u017Eadov\u00E1na opr\u00E1vn\u011Bn\u00ED administr\u00E1tora). share.manage = Spravovat m\u00E1 sd\u00EDlen\u00E1 m\u00E9dia @@ -643,7 +643,7 @@ helppopup.transcode.text =

      Pokud m\u00E1te omezenou \u0161\u00ED\u0159ku p\u0 Nap\u0159\u00EDklad, pokud origin\u00E1ln\u00ED soubory mp3 maj\u00ED 256 Kb/s (kilobajt\u016F za sekundu), nastaven\u00ED maxim\u00E1ln\u00ED p\u0159enosov\u00E9 rychlosti \ na 128 zp\u016Fsob\u00ED, \u017Ee {0} automaticky p\u0159evzorkuje hudbu z 256 na 128 Kb/s.

      helppopup.playlistfolder.title = Importovat seznam stop z -helppopup.playlistfolder.text =

      Libresonic bude pravideln\u011B importovat seznamy stop ulo\u017Een\u00E9 v t\u00E9to slo\u017Ece.

      +helppopup.playlistfolder.text =

      Airsonic bude pravideln\u011B importovat seznamy stop ulo\u017Een\u00E9 v t\u00E9to slo\u017Ece.

      helppopup.musicmask.title = Hudebn\u00ED soubory helppopup.musicmask.text =

      Umo\u017E\u0148uje v\u00E1m zvolit typy soubor\u016F, kter\u00E9 by m\u011Bly b\u00FDt pova\u017Eov\u00E1ny za hudbu.

      helppopup.videomask.title = Soubory vide\u00ED diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties index ab6f853b..a0559a39 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties @@ -44,7 +44,7 @@ top.more = Mere top.help = Hj\u00E6lp top.search = S\u00F8g top.upgrade = En ny version er tilg\u00E6ngelig. Download {0} {1} \ - her. + her. top.missing = Ingen medie mapper fundet. Skal du \u00E6ndre indstillingerne. top.logout = Log ud {0} @@ -137,8 +137,8 @@ more.random.year = og \u00E5r more.random.anyyear = Enhver more.random.folder = i mappen more.random.anyfolder = Enhver -more.apps.title = Libresonic Apps -more.apps.text =

      Libresonic Apps er til \ +more.apps.title = Airsonic Apps +more.apps.text =

      Airsonic Apps er til \ r\u00E5dighed for iPhone, Android og AIR.

      more.mobile.title = Mobiltelefon more.mobile.text =

      Du kan styre {0} fra en WAP-mobiltelefon eller PDA.
      \ @@ -166,7 +166,7 @@ upload.unzipped = Udpakket {0} # Help.jsp help.title = Om {0} help.upgrade = Bem\u00E6rk! En ny version er tilg\u00E6ngelig. Download {0} {1} \ - her. + her. help.version.title = Version help.builddate.title = Oprettelsesdato help.server.title = Server @@ -180,7 +180,7 @@ help.contact.title = Kontakt help.contact.text = {0} er udviklet og vedligeholdes af Sindre Mehus \ ( sindre@activeobjects.no ). \ Hvis du har sp\u00F8rgsm\u00E5l, kommentarer eller forslag til forbedringer, kan du bes\u00F8ge \ - Libresonic Forum. + Airsonic Forum. help.log = Log help.logfile = Den komplette log er gemt i {0}. @@ -297,7 +297,7 @@ transcodingsettings.info =

      (% s = Den fil, der skal omkodet,% giver mulighed for streaming af medier, der normalt ville ikke v\u00E6re mulige at streame. Denne omkodning er foretaget on-the-fly og kr\u00E6ver nogen diskaktivitet.

      \

      Den faktiske omkodning er udf\u00F8rt af tredjepart kommandolinje-programmer, som skal installeres i {0}. \ En omkodning pakke til Windows \ - er tilg\u00E6ngelig her. Du kan tilf\u00F8je dine egne brugerdefinerede omkodninger og kaldet transcoder, hvis det \ + er tilg\u00E6ngelig her. Du kan tilf\u00F8je dine egne brugerdefinerede omkodninger og kaldet transcoder, hvis det \ opfylder f\u00F8lgende krav: \

        \
      • Den skal have en kommandolinje-gr\u00E6nseflade.
        • \ @@ -346,8 +346,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Spil medie direkte i webbrowseren ved hj\u00E6lp af integreret Flash Player. playersettings.technology.external.text = Spil medie i din foretrukne afspiller, s\u00E5som Winamp eller Windows Media Player. playersettings.technology.external_with_playlist.text = Samme som ovenfor, men afspilningslisten forvaltes af afspilleren, snarere \ - end Libresonic serveren. I denne tilstand, springe inden sange er muligt. -playersettings.technology.jukebox.text = Spil medie direkte p\u00E5 lydenheden til Libresonic serveren. (Autoriserede brugere). + end Airsonic serveren. I denne tilstand, springe inden sange er muligt. +playersettings.technology.jukebox.text = Spil medie direkte p\u00E5 lydenheden til Airsonic serveren. (Autoriserede brugere). playersettings.name = Afspiller navn playersettings.coverartsize = Cover st\u00F8rrelse playersettings.maxbitrate = Max bitrate @@ -438,13 +438,13 @@ main.clearchat = Slet chat meddelelse # gettingsStarted.jsp gettingStarted.title = Kom godt i gang -gettingStarted.text =

        Velkommen til Libresonic! Som ops\u00E6ttes p\u00E5 ingen tid, skal du blot f\u00F8lge de grundl\u00E6ggende trin nedenfor.
        \ +gettingStarted.text =

        Velkommen til Airsonic! Som ops\u00E6ttes p\u00E5 ingen tid, skal du blot f\u00F8lge de grundl\u00E6ggende trin nedenfor.
        \ Klik p\u00E5 "Forside" knappen i v\u00E6rkt\u00F8jslinjen ovenfor for at komme tilbage til dette sk\u00E6rmbillede.

        gettingStarted.step1.title = Skift administrator adgangskode. gettingStarted.step1.text = Sikre din server ved at \u00E6ndre standard password for administrator konto. \ Du kan ogs\u00E5 oprette nye brugerkonti med forskellige rettigheder. gettingStarted.step2.title = Indstil medie mapper. -gettingStarted.step2.text = Fort\u00E6l Libresonic hvor du opbevarer din medie. +gettingStarted.step2.text = Fort\u00E6l Airsonic hvor du opbevarer din medie. gettingStarted.step3.title = Konfigurer netv\u00E6rksindstillinger. gettingStarted.hide = Vis ikke denne igen gettingStarted.hidealert = For at vise dette sk\u00E6rmbillede igen, skal du g\u00E5 til Indstillinger > Generel. @@ -499,7 +499,7 @@ share.warning =

        VIGTIG INFORMATION!

        Undg\u00E5 at dele ophavsretligt share.facebook = Del p\u00E5 Facebook share.twitter = Del p\u00E5 Twitter share.link = Eller dele dette med nogen, ved at sende dem dette link: {0} -share.disabled = Hvis du vil dele din medie med nogen, skal du f\u00F8rst registrere din egen libresonic.org address.
        \ +share.disabled = Hvis du vil dele din medie med nogen, skal du f\u00F8rst registrere din egen airsonic.org address.
        \ G\u00E5 til Settings > Network (administrative rights required). share.manage = Administrere mine delte medier diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties index 2873693f..14a2a82f 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties @@ -68,7 +68,7 @@ top.more = Mehr top.help = Hilfe top.search = Suchen top.upgrade = Eine neue Version ist erh\u00E4ltlich. Download {0} {1} \ - hier. + hier. top.missing = Keine Musikordner gefunden. Bitte die Einstellungen \u00FCberpr\u00FCfen. top.logout = Ausloggen {0} @@ -167,13 +167,13 @@ search.hits.songs = Songs # gettingStarted.jsp gettingStarted.title = Erster Start -gettingStarted.text =

        Willkommen in Libresonic! Wir werden in K\u00FCrze soweit sein, folgen sie dazu den unten aufgef\u00FChrten grundlegenden Schritten.
        \ +gettingStarted.text =

        Willkommen in Airsonic! Wir werden in K\u00FCrze soweit sein, folgen sie dazu den unten aufgef\u00FChrten grundlegenden Schritten.
        \ Klicke den "Startseite" Button oberhalb der Toolbar um zu diesem Bildschirm zur\u00FCckzukehren.

        gettingStarted.step1.title = \u00C4ndere das Administrator Kennwort. gettingStarted.step1.text = Sichere deinen Server indem du das Standard Passwort f\u00FCr den Administrator Account \u00E4nderst. \ Sie k\u00F6nnen auch Benutzerkonten mit unterschiedlichen Berechtigungen erstellen. gettingStarted.step2.title = Musikordner einrichten. -gettingStarted.step2.text = Zeige Libresonic wo sich deine Musik befindet. +gettingStarted.step2.text = Zeige Airsonic wo sich deine Musik befindet. gettingStarted.step3.title = Konfiguriere Netzwerk Einstellungen. gettingStarted.hide = Nicht wieder anzeigen gettingStarted.hidealert = Um diesen Bildschirm wieder anzuzeigen, gehe zu Einstellungen > Allgemein. @@ -221,8 +221,8 @@ more.random.year = und dem Jahr more.random.anyyear = Alle more.random.folder = im Verzeichnis more.random.anyfolder = Alle -more.apps.title = Libresonic Apps -more.apps.text =

        Schauen sie in die stetig wachsende Liste der Libresonic Anwendungen. \ +more.apps.title = Airsonic Apps +more.apps.text =

        Schauen sie in die stetig wachsende Liste der Airsonic Anwendungen. \ Diese sorgt f\u00FCr Spa\u00DF und alternative M\u00F6glichkeiten um ihre Mediensammlung genie\u00DFen zu k\u00F6nnen - Egal wo sie gerade sind. \ Die Apps sind verf\u00FCgbar f\u00FCr Android, iPhone, Windows Phone, BlackBerry, Roku und viele mehr.

        @@ -255,7 +255,7 @@ upload.unzipped = Entpackt {0} # help.jsp help.title = \u00DCber {0} help.upgrade = Note! Eine neue Version ist erh\u00E4ltlich. Download {0} {1} \ - hier. + hier. help.version.title = Version help.builddate.title = Erstellungs Datum help.server.title = Server @@ -268,7 +268,7 @@ help.contact.title = Kontakt help.contact.text = {0} ist von Sindre Mehus entwickelt worden \ (sindre@activeobjects.no). \ Wenn du Fragen, Kommentare oder Vorschl\u00E4ge f\u00FCr Verbesserungen hast, dann besuche bitte das \ - Libresonic Forum. + Airsonic Forum. help.log = Log help.logfile = Der komplette Log ist gespeichert in {0}. @@ -385,7 +385,7 @@ musicfoldersettings.fastcache = Schnellzugriff musicfoldersettings.fastcache.description = Nutze diese Funktion um den Festplattenzugriff zu minimieren, zum Beispiel wenn sich ihre Medien auf einem Netzlaufwerk befinden. \ Anmerkung: \u00C4nderungen an Dateien werden nur sichtbar, nachdem Sie Ihre Medienordner gescannt haben. musicfoldersettings.expunge = Bereinige Datenbank -musicfoldersettings.expunge.description = Libresonic speichert alle aufgefundenen Informationen \u00FCber alle Mediendateien die gescannt wurden. Bei der Bereinigung der Datenbank, werden alle Informationen \u00FCber Dateien \ +musicfoldersettings.expunge.description = Airsonic speichert alle aufgefundenen Informationen \u00FCber alle Mediendateien die gescannt wurden. Bei der Bereinigung der Datenbank, werden alle Informationen \u00FCber Dateien \ die nicht mehr in ihrer Medienbibliothek vorhanden sind, entg\u00FCltig entfernt. musicfoldersettings.organizebyfolderstructure = Organisieren nach Ordnerstruktur musicfoldersettings.organizebyfolderstructure.description = Verwende diese Funktion um die Medienbibliothek nach Verzeichnisstruktur zu durchsuchen anstatt nach Artist / oder Album Info in den ID3-Tags. @@ -410,7 +410,7 @@ transcodingsettings.info =

        (%s = Die Datei die transcodiert wi Festplattenspeicher.

        \

        Das Transcoding wird von Drittanbieter-Kommandozeilenprogrammen \u00FCbernommen, welche in {0} installiert sein m\u00FCssen. \ Mehr \u00FCber das Transcoding erf\u00E4hrst du \ - hier hier. Du kannst deinen eigenen Transcoder verwenden, wenn er \ + hier hier. Du kannst deinen eigenen Transcoder verwenden, wenn er \ folgende Funktionen erf\u00FCllt: \

          \
        • Er muss ein Kommandozeilen-Interface haben.
          • \ @@ -464,16 +464,16 @@ playersettings.clone = Dupliziere Player dlnasettings.enabled = Erm\u00F6gliche DLNA-Server -dlnasettings.description = Verwenden Sie diese Option um den DLNA / UPnP Medienserver in Libresonic zu aktivieren, \ +dlnasettings.description = Verwenden Sie diese Option um den DLNA / UPnP Medienserver in Airsonic zu aktivieren, \ und streamen Sie ihre Medien zu einem kompatiblen DLNA-Player. dlnasettings.servername = Medienserver-Name dlnasettings.servername.description = Der Name des Medienservers, wie er im DLNA-Player angezeigt wird. sonossettings.enabled = Erm\u00F6gliche Sonos Musik-Service -sonossettings.description = Verwenden Sie diese Option um den Sonos-Musikdienst in Libresonic zu aktivieren, \ - und streamen Sie ihre Medien zu Sonos-Ger\u00E4ten in ihrem lokalen Netzwerk. Denken sie daran, Libresonic \ +sonossettings.description = Verwenden Sie diese Option um den Sonos-Musikdienst in Airsonic zu aktivieren, \ + und streamen Sie ihre Medien zu Sonos-Ger\u00E4ten in ihrem lokalen Netzwerk. Denken sie daran, Airsonic \ in ihrem Sonos-Controller als Musik-Dienst hinzuzuf\u00FCgen. Besuchen Sie \ - sonos.libresonic.org f\u00FCr mehr Infos. \ + sonos.airsonic.org f\u00FCr mehr Infos. \ Zur Fehlersuche, schauen sie hier im log. sonossettings.servicename = Musik-Dienst Name sonossettings.servicename.description = Der Name des Musik-Dienstes wie er im Sonos-Controller angezeigt wird. @@ -484,8 +484,8 @@ playersettings.technology.external_with_playlist.title = Externer Player mit Pla playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Spiele Musik direkt im Browser mit integrierten Flash-Player. playersettings.technology.external.text = Spielt Musik in ihrem Lieblingsplayer ab, wie etwa Winamp oder Mediaplayer. -playersettings.technology.external_with_playlist.text = Wie oben, aber die Playlist wird durch den Player verwaltet statt dem Libresonic-Server. In diesem Modus ist das \u00FCberspringen von Songs m\u00F6glich. -playersettings.technology.jukebox.text = Spielt die Musik direkt auf dem Audioger\u00E4t des Libresonic-Servers ab. (Nur f\u00FCr autorisierte User). +playersettings.technology.external_with_playlist.text = Wie oben, aber die Playlist wird durch den Player verwaltet statt dem Airsonic-Server. In diesem Modus ist das \u00FCberspringen von Songs m\u00F6glich. +playersettings.technology.jukebox.text = Spielt die Musik direkt auf dem Audioger\u00E4t des Airsonic-Servers ab. (Nur f\u00FCr autorisierte User). # shareSettings.jsp sharesettings.name = Name @@ -508,7 +508,7 @@ share.warning =

          WICHTIGER HINWEIS!

          Play fair – Teile in keinste share.facebook = Teile auf Facebook share.twitter = Teile auf Twitter share.link = Oder teile es mit jemanden indem du diesen Link weitergibst: {0} -share.disabled = Um Musik mit jemanden teilen zu k\u00F6nnen musst du erst deine eigene libresonic.org Addresse registrieren.
          \ +share.disabled = Um Musik mit jemanden teilen zu k\u00F6nnen musst du erst deine eigene airsonic.org Addresse registrieren.
          \ Bitte wechsle zu Settings > Network (Administratorrechte werden ben\u00F6tigt). share.manage = Meine geteilten Medien verwalten diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties index 200b3f3b..83ee4bd1 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties @@ -44,7 +44,7 @@ top.more = \u03A0\u03B5\u03C1\u03B9\u03C3\u03C3\u03CC\u03C4\u03B5\u03C1\u03B1 top.help = \u03A0\u03B5\u03C1\u03AF top.search = \u0391\u03BD\u03B1\u03B6\u03AE\u03C4\u03B7\u03C3\u03B7 top.upgrade = \u039C\u03AF\u03B1 \u03BA\u03B1\u03B9\u03BD\u03BF\u03CD\u03C1\u03B9\u03B1 \u03AD\u03BA\u03B4\u03BF\u03C3\u03B7 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B7. Download {0} {1} \ - \u03B5\u03B4\u03CE. + \u03B5\u03B4\u03CE. top.missing = \u0394\u03B5\u03BD \u03B2\u03C1\u03AD\u03B8\u03B7\u03BA\u03B1\u03BD \u03C6\u03AC\u03BA\u03B5\u03BB\u03BF\u03B9 \u03BC\u03B5 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03AC \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B1\u03BB\u03BB\u03AC\u03BE\u03C4\u03B5 \u03C4\u03B9\u03C2 \u03C1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B1\u03C2. top.logout = \u0391\u03C0\u03BF\u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 {0} @@ -112,14 +112,14 @@ search.hits.songs = \u03A4\u03C1\u03B1\u03B3\u03BF\u03CD\u03B4\u03B9\u03B1 # gettingStarted.jsp gettingStarted.title = \u039E\u03B5\u03BA\u03B9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03B5\u03B4\u03CE -gettingStarted.text =

          \u039A\u03B1\u03BB\u03CE\u03C2 \u03AE\u03C1\u03B8\u03B1\u03C4\u03B5 \u03C3\u03C4\u03BF Libresonic! \u0398\u03B1 \u03B5\u03AF\u03C3\u03C4\u03B5 \u03AD\u03C4\u03BF\u03B9\u03BC\u03BF\u03B9 \u03C3\u03B5 \u03BB\u03AF\u03B3\u03BF \u03C7\u03C1\u03BF\u03BD\u03B9\u03BA\u03CC \u03B4\u03B9\u03AC\u03C3\u03C4\u03B7\u03BC\u03B1, \u03B1\u03BA\u03BF\u03BB\u03BF\u03C5\u03B8\u03CE\u03BD\u03C4\u03B1\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03BF\u03B4\u03B7\u03B3\u03AF\u03B5\u03C2
          \ +gettingStarted.text =

          \u039A\u03B1\u03BB\u03CE\u03C2 \u03AE\u03C1\u03B8\u03B1\u03C4\u03B5 \u03C3\u03C4\u03BF Airsonic! \u0398\u03B1 \u03B5\u03AF\u03C3\u03C4\u03B5 \u03AD\u03C4\u03BF\u03B9\u03BC\u03BF\u03B9 \u03C3\u03B5 \u03BB\u03AF\u03B3\u03BF \u03C7\u03C1\u03BF\u03BD\u03B9\u03BA\u03CC \u03B4\u03B9\u03AC\u03C3\u03C4\u03B7\u03BC\u03B1, \u03B1\u03BA\u03BF\u03BB\u03BF\u03C5\u03B8\u03CE\u03BD\u03C4\u03B1\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03BF\u03B4\u03B7\u03B3\u03AF\u03B5\u03C2
          \ \u03A0\u03B1\u03C4\u03AE\u03C3\u03C4\u03B5 \u03C4\u03BF \u03BA\u03BF\u03C5\u03BC\u03C0\u03AF "\u0388\u03BD\u03B1\u03C1\u03BE\u03B7" \u03C3\u03C4\u03BF \u03C0\u03BB\u03B1\u03AF\u03C3\u03B9\u03BF \u03B5\u03C1\u03B3\u03B1\u03BB\u03B5\u03AF\u03C9\u03BD \u03C0\u03B1\u03C1\u03B1\u03C0\u03AC\u03BD\u03C9 \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03B5\u03C0\u03B1\u03BD\u03AD\u03BB\u03B8\u03B5\u03C4\u03B5 \u03C3\u03C4\u03B7 \u03C0\u03B1\u03C1\u03BF\u03CD\u03C3\u03B1 \u03BF\u03B8\u03CC\u03BD\u03B7.

          \ -

          \u0393\u03B9\u03B1 \u03C0\u03B5\u03C1\u03B9\u03C3\u03C3\u03CC\u03C4\u03B5\u03C1\u03B5\u03C2 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2, \u03BA\u03BF\u03B9\u03C4\u03AC\u03BE\u03C4\u03B5 \u03C4\u03BF\u03BDGetting started \u03BF\u03B4\u03B7\u03B3\u03CC.

          +

          \u0393\u03B9\u03B1 \u03C0\u03B5\u03C1\u03B9\u03C3\u03C3\u03CC\u03C4\u03B5\u03C1\u03B5\u03C2 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2, \u03BA\u03BF\u03B9\u03C4\u03AC\u03BE\u03C4\u03B5 \u03C4\u03BF\u03BDGetting started \u03BF\u03B4\u03B7\u03B3\u03CC.

          gettingStarted.step1.title = \u0391\u03BB\u03BB\u03B1\u03B3\u03AE \u03BA\u03C9\u03B4\u03B9\u03BA\u03BF\u03CD \u03B4\u03B9\u03B1\u03C7\u03B5\u03B9\u03C1\u03B9\u03C3\u03C4\u03AE. gettingStarted.step1.text = \u0391\u03C3\u03C6\u03B1\u03BB\u03AF\u03C3\u03C4\u03B5 \u03C4\u03BF\u03BD \u03C5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03C4\u03AE \u03C3\u03B1\u03C2, \u03B1\u03BB\u03BB\u03AC\u03B6\u03BF\u03BD\u03C4\u03B1\u03C2 \u03C4\u03BF \u03C0\u03C1\u03BF\u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03BF \u03BA\u03C9\u03B4\u03B9\u03BA\u03CC \u03B3\u03B9\u03B1 \u03C4\u03BF\u03BD \u03B4\u03B9\u03B1\u03C7\u03B5\u03B9\u03C1\u03B9\u03C3\u03C4\u03AE. \ \u039C\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03B5\u03C0\u03AF\u03C3\u03B7\u03C2 \u03BD\u03B1 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AE\u03C3\u03B5\u03C4\u03B5 \u03BA\u03B1\u03B9\u03BD\u03BF\u03CD\u03C1\u03B9\u03BF\u03C5\u03C2 \u03BB\u03BF\u03B3\u03B1\u03C1\u03B9\u03B1\u03C3\u03BC\u03BF\u03CD\u03C2 \u03BC\u03B5 \u03B4\u03B9\u03AC\u03C6\u03BF\u03C1\u03B1 \u03C0\u03C1\u03BF\u03BD\u03CC\u03BC\u03B9\u03B1. gettingStarted.step2.title = \u03A3\u03CD\u03C3\u03C4\u03B1\u03C3\u03B7 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03CE\u03BD \u03C6\u03B1\u03BA\u03AD\u03BB\u03C9\u03BD. -gettingStarted.step2.text = \u03A5\u03C0\u03BF\u03B4\u03B5\u03AF\u03BE\u03B5\u03C4\u03B5 \u03C3\u03C4\u03BF Libresonic \u03C0\u03BF\u03C5 \u03BA\u03C1\u03B1\u03C4\u03AC\u03C4\u03B5 \u03C4\u03BF\u03C5\u03C2 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03BF\u03CD\u03C2 \u03C3\u03B1\u03C2 \u03C6\u03B1\u03BA\u03AD\u03BB\u03BF\u03C5\u03C2. +gettingStarted.step2.text = \u03A5\u03C0\u03BF\u03B4\u03B5\u03AF\u03BE\u03B5\u03C4\u03B5 \u03C3\u03C4\u03BF Airsonic \u03C0\u03BF\u03C5 \u03BA\u03C1\u03B1\u03C4\u03AC\u03C4\u03B5 \u03C4\u03BF\u03C5\u03C2 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03BF\u03CD\u03C2 \u03C3\u03B1\u03C2 \u03C6\u03B1\u03BA\u03AD\u03BB\u03BF\u03C5\u03C2. gettingStarted.step3.title = \u039C\u03BF\u03C1\u03C6\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03C0\u03B1\u03C1\u03B1\u03BC\u03AD\u03C4\u03C1\u03C9\u03BD \u03B4\u03B9\u03BA\u03C4\u03CD\u03BF\u03C5. gettingStarted.hide = \u039D\u03B1 \u03BC\u03B7\u03BD \u03C6\u03B1\u03BD\u03B5\u03AF \u03BE\u03B1\u03BD\u03AC \u03B1\u03C5\u03C4\u03CC. gettingStarted.hidealert = \u0393\u03B9\u03B1 \u03BD\u03B1 \u03B4\u03B5\u03AF\u03C4\u03B5 \u03BE\u03B1\u03BD\u03AC \u03B1\u03C5\u03C4\u03AE \u03C4\u03B7\u03BD \u03BF\u03B8\u03CC\u03BD\u03B7, \u03C0\u03B7\u03B3\u03B1\u03AF\u03BD\u03B5\u03C4\u03B5 \u03C3\u03C4\u03B9\u03C2 \u03C1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 > \u0393\u03B5\u03BD\u03B9\u03BA\u03AC. @@ -160,8 +160,8 @@ more.random.year = \u03BA\u03B1\u03B9 \u03C7\u03C1\u03BF\u03BD\u03B9\u03AC more.random.anyyear = \u039F\u03C4\u03B9\u03B4\u03AE\u03C0\u03BF\u03C4\u03B5 more.random.folder = \u03C3\u03C4\u03BF\u03BD \u03C6\u03AC\u03BA\u03B5\u03BB\u03BF more.random.anyfolder = \u039F\u03C4\u03B9\u03B4\u03AE\u03C0\u03BF\u03C4\u03B5 -more.apps.title = Libresonic \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03AD\u03C2 -more.apps.text =

          \u039F\u03B9 Libresonic \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03AD\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B5\u03C2 \u03B3\u03B9\u03B1 Android, iPhone, \ +more.apps.title = Airsonic \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03AD\u03C2 +more.apps.text =

          \u039F\u03B9 Airsonic \u03B5\u03C6\u03B1\u03C1\u03BC\u03BF\u03B3\u03AD\u03C2 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B5\u03C2 \u03B3\u03B9\u03B1 Android, iPhone, \ Windows Phone and AIR.

          more.mobile.title = \u039A\u03B9\u03BD\u03B7\u03C4\u03CC \u03C4\u03B7\u03BB\u03AD\u03C6\u03C9\u03BD\u03BF more.mobile.text =

          \u039C\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03BA\u03BF\u03BD\u03C4\u03C1\u03BF\u03BB\u03AC\u03C1\u03B5\u03C4\u03B5 {0} \u03B1\u03C0\u03CC \u03BA\u03AC\u03B8\u03B5 \u03C4\u03B7\u03BB\u03AD\u03C6\u03C9\u03BD\u03BF \u03AE PDA \u03BC\u03B5 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7 \u03C3\u03B5 WAP.
          \ @@ -189,13 +189,13 @@ upload.unzipped = \u0391\u03C0\u03BF\u03C3\u03C5\u03BC\u03C0\u03B9\u03AD\u03C3\u # help.jsp help.title = \u03A0\u03B5\u03C1\u03AF {0} help.upgrade = Note! \u039C\u03B9\u03B1 \u03BA\u03B1\u03B9\u03BD\u03BF\u03CD\u03C1\u03B9\u03B1 \u03AD\u03BA\u03B4\u03BF\u03C3\u03B7 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B7. \u039A\u03B1\u03C4\u03B5\u03B2\u03AC\u03C3\u03C4\u03B5 {0} {1} \ - here. + here. help.version.title = \u0388\u03BA\u03B4\u03BF\u03C3\u03B7 help.builddate.title = \u0397\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1 \u03A0\u03B1\u03C1\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2 help.server.title = \u03A5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03C4\u03AE\u03C2 help.license.title = \u03A0\u03C1\u03BF\u03CB\u03C0\u03BF\u03B8\u03AD\u03C3\u03B5\u03B9\u03C2 \u03C4\u03B7\u03C2 \u03C7\u03C1\u03AE\u03C3\u03B7\u03C2 help.license.text = {0} is free software distributed under the GPL open-source license. \ - {0} uses licensed third-party libraries. Please note that {0} is not \ + {0} uses licensed third-party libraries. Please note that {0} is not \ a tool for illegal distribution of copyrighted material. Always pay attention to and follow the relevant laws specific to your country. help.homepage.title = \u0391\u03C1\u03C7\u03B9\u03BA\u03AE help.forum.title = \u03A6\u03CC\u03C1\u03BF\u03C5\u03BC @@ -204,7 +204,7 @@ help.contact.title = \u0395\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03A help.contact.text = {0} \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B1\u03BD\u03B5\u03C0\u03C4\u03C5\u03B3\u03BC\u03AD\u03BD\u03BF \u03BA\u03B1\u03B9 \u03C3\u03C5\u03BD\u03C4\u03B7\u03C1\u03AE\u03C4\u03B1\u03B9 \u03B1\u03C0\u03BF \u03C4\u03BF\u03BD Sindre Mehus \ (sindre@activeobjects.no). \ \u0391\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B5\u03C1\u03C9\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2, \u03C3\u03C7\u03CC\u03BB\u03B9\u03B1, \u03AE \u03C0\u03C1\u03BF\u03C4\u03AC\u03C3\u03B5\u03B9\u03C2 \u03B3\u03B9\u03B1 \u03B2\u03B5\u03BB\u03C4\u03AF\u03C9\u03C3\u03B7 \u03C4\u03BF\u03C5 \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03BF\u03CD \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B5\u03C0\u03B9\u03C3\u03BA\u03B5\u03C6\u03B8\u03B5\u03AF\u03C4\u03B5 \u03C4\u03BF \ - Libresonic Forum. + Airsonic Forum. help.log = \u0391\u03C1\u03C7\u03B5\u03AF\u03BF \u03BA\u03B1\u03C4\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2 help.logfile = \u038C\u03BB\u03BF \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF \u03BA\u03B1\u03C4\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2 \u03B2\u03C1\u03AF\u03C3\u03BA\u03B5\u03C4\u03B1\u03B9 \u03C3\u03C4\u03BF {0}. @@ -322,7 +322,7 @@ transcodingsettings.info =

          (%s = \u03A4\u03BF \u03B1\u03C1\u03 \u03C7\u03C1\u03AE\u03C3\u03B7 \u03C4\u03BF\u03C5 \u03C3\u03BA\u03BB\u03B7\u03C1\u03BF\u03CD \u03B4\u03AF\u03C3\u03BA\u03BF\u03C5.

          \

          \u0397 \u03BC\u03B5\u03C4\u03B1\u03C4\u03C1\u03BF\u03C0\u03AE \u03B3\u03AF\u03BD\u03B5\u03C4\u03B1\u03B9 \u03BC\u03AD\u03C3\u03C9 \u03C0\u03C1\u03BF\u03B3\u03C1\u03B1\u03BC\u03BC\u03AC\u03C4\u03C9\u03BD \u03B3\u03C1\u03B1\u03BC\u03BC\u03AE\u03C2, \u03C4\u03C1\u03AF\u03C4\u03C9\u03BD \u03C0\u03C1\u03BF\u03C3\u03CE\u03C0\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B8\u03B1 \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AE\u03B4\u03B7 \u03B5\u03B3\u03BA\u03B1\u03C4\u03B5\u03C3\u03C4\u03B7\u03BC\u03AD\u03BD\u03B1 \u03C3\u03C4\u03BF {0}. \ \u0388\u03BD\u03B1 \u03C0\u03B1\u03BA\u03AD\u03C4\u03BF \u03BC\u03B5\u03C4\u03B1\u03C4\u03C1\u03BF\u03C0\u03CE\u03BD \u03B3\u03B9\u03B1 Windows \ - \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03BF \u03C3\u03C4\u03BF \u03B5\u03B4\u03CE. \u039C\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03C4\u03B5 \u03C4\u03BF \u03B4\u03B9\u03BA\u03CC \u03C3\u03B1\u03C2 \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC \u03BC\u03B5\u03C4\u03B1\u03C4\u03C1\u03BF\u03C0\u03CE\u03BD \u03B5\u03AC\u03BD \ + \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03BF \u03C3\u03C4\u03BF \u03B5\u03B4\u03CE. \u039C\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03C4\u03B5 \u03C4\u03BF \u03B4\u03B9\u03BA\u03CC \u03C3\u03B1\u03C2 \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC \u03BC\u03B5\u03C4\u03B1\u03C4\u03C1\u03BF\u03C0\u03CE\u03BD \u03B5\u03AC\u03BD \ \u03C0\u03BB\u03B7\u03C1\u03B5\u03AF \u03C4\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03C1\u03BF\u03CB\u03C0\u03BF\u03B8\u03AD\u03C3\u03B5\u03B9\u03C2: \

            \
          • \u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7 \u03B1\u03C0\u03CC \u03B3\u03C1\u03B1\u03BC\u03BC\u03AE \u03B5\u03BD\u03C4\u03BF\u03BB\u03CE\u03BD.
            • \ @@ -372,8 +372,8 @@ playersettings.technology.jukebox.title = \u03A4\u03B6\u03BF\u03CD\u03BA \u03BC\ playersettings.technology.web.text = \u03A0\u03B1\u03AF\u03BE\u03C4\u03B5 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03AE \u03B1\u03C0\u03B5\u03C5\u03B8\u03B5\u03AF\u03B1\u03C2 \u03C3\u03C4\u03BF \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC \u03C0\u03BB\u03BF\u03AE\u03B3\u03B7\u03C3\u03B7\u03C2 \u03B9\u03C3\u03C4\u03BF\u03CD (browser) \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03CC\u03BD\u03C4\u03B1\u03C2 \u03C4\u03BF \u03B5\u03BD\u03C3\u03C9\u03BC\u03B1\u03C4\u03BF\u03BC\u03AD\u03BD\u03BF Flash player. playersettings.technology.external.text = \u03A0\u03B1\u03AF\u03BE\u03C4\u03B5 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03AE \u03C3\u03C4\u03BF\u03BD \u03B1\u03B3\u03B1\u03C0\u03B7\u03BC\u03AD\u03BD\u03BF \u03C3\u03B1\u03C2 \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC \u03B1\u03BD\u03B1\u03C0\u03B1\u03C1\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2, \u03CC\u03C0\u03C9\u03C2 \u03C4\u03BF WinAmp \u03AE \u03C4\u03BF Windows Media Player. playersettings.technology.external_with_playlist.text = \u038A\u03B4\u03B9\u03BF \u03CC\u03C0\u03C9\u03C2 \u03C4\u03BF \u03C0\u03B1\u03C1\u03B1\u03C0\u03AC\u03BD\u03C9, \u03BC\u03B5 \u03C4\u03B7\u03BD \u03BB\u03AF\u03C3\u03C4\u03B1 \u03B1\u03BD\u03B1\u03C0\u03B1\u03C1\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2 \u03B5\u03BB\u03AD\u03B3\u03C7\u03B5\u03C4\u03B1\u03B9 \u03B1\u03C0\u03BF \u03C4\u03BF\u03BD \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC \u03B1\u03BD\u03B1\u03C0\u03B1\u03C1\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2 \u03B1\u03BD\u03C4\u03AF \ - \u03B1\u03C0\u03CC \u03C4\u03BF Libresonic. \u039C\u03B5 \u03B1\u03C5\u03C4\u03CC \u03C4\u03BF\u03BD \u03C4\u03C1\u03CC\u03C0\u03BF \u03B7 \u03BC\u03B5\u03C4\u03B1\u03C0\u03AE\u03B4\u03B7\u03C3\u03B7 \u03C4\u03C1\u03B1\u03B3\u03BF\u03C5\u03B4\u03B9\u03CE\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03C5\u03BD\u03B1\u03C4\u03AE. -playersettings.technology.jukebox.text = \u03A0\u03B1\u03AF\u03BE\u03C4\u03B5 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03AE \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03C3\u03C5\u03C3\u03BA\u03B5\u03C5\u03AE \u03AE\u03C7\u03BF\u03C5 \u03C4\u03BF\u03C5 \u03C5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03C4\u03AE \u03CC\u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B5\u03B3\u03BA\u03B1\u03C4\u03B5\u03C3\u03C4\u03B7\u03BC\u03AD\u03BD\u03BF \u03C4\u03BF Libresonic. (\u0395\u03BE\u03BF\u03C5\u03C3\u03B9\u03BF\u03B4\u03BF\u03C4\u03B7\u03BC\u03AD\u03BD\u03BF\u03B9 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B5\u03C2 \u03BC\u03CC\u03BD\u03BF). + \u03B1\u03C0\u03CC \u03C4\u03BF Airsonic. \u039C\u03B5 \u03B1\u03C5\u03C4\u03CC \u03C4\u03BF\u03BD \u03C4\u03C1\u03CC\u03C0\u03BF \u03B7 \u03BC\u03B5\u03C4\u03B1\u03C0\u03AE\u03B4\u03B7\u03C3\u03B7 \u03C4\u03C1\u03B1\u03B3\u03BF\u03C5\u03B4\u03B9\u03CE\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03C5\u03BD\u03B1\u03C4\u03AE. +playersettings.technology.jukebox.text = \u03A0\u03B1\u03AF\u03BE\u03C4\u03B5 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03AE \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03C3\u03C5\u03C3\u03BA\u03B5\u03C5\u03AE \u03AE\u03C7\u03BF\u03C5 \u03C4\u03BF\u03C5 \u03C5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03C4\u03AE \u03CC\u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B5\u03B3\u03BA\u03B1\u03C4\u03B5\u03C3\u03C4\u03B7\u03BC\u03AD\u03BD\u03BF \u03C4\u03BF Airsonic. (\u0395\u03BE\u03BF\u03C5\u03C3\u03B9\u03BF\u03B4\u03BF\u03C4\u03B7\u03BC\u03AD\u03BD\u03BF\u03B9 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B5\u03C2 \u03BC\u03CC\u03BD\u03BF). playersettings.name = \u038C\u03BD\u03BF\u03BC\u03B1 \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03BF\u03CD \u03B1\u03BD\u03B1\u03C0\u03B1\u03C1\u03B1\u03B3\u03C9\u03B3\u03AE\u03C2 playersettings.coverartsize = \u039C\u03AD\u03B3\u03B5\u03B8\u03BF\u03C2 \u03B5\u03B9\u03BA\u03CC\u03BD\u03C9\u03BD \u03C3\u03C5\u03BB\u03BB\u03BF\u03B3\u03AE\u03C2 playersettings.maxbitrate = \u039C\u03AD\u03B3\u03B9\u03C3\u03C4\u03BF bitrate diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties index 30252b63..d58691b2 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties @@ -68,7 +68,7 @@ top.more = More top.help = About top.search = Search top.upgrade = A new version is available. Download {0} {1} \ - here. + here. top.missing = No media folders found. Please change the settings. top.logout = Log out {0} @@ -172,19 +172,19 @@ search.hits.videos = Videos # gettingStarted.jsp gettingStarted.title = Getting started -gettingStarted.text =

            Welcome to Libresonic! We'll set you up in no time, just follow the basic steps below.
            \ +gettingStarted.text =

            Welcome to Airsonic! We'll set you up in no time, just follow the basic steps below.
            \ Click the "Home" button in the toolbar above to return to this screen.

            \ -

            For more information, please consult the Getting started guide.

            -gettingStarted.root = Warning! The Libresonic process is running as the root user. Please consider to \ - change this. +

            For more information, please consult the Getting started guide.

            +gettingStarted.root = Warning! The Airsonic process is running as the root user. Please consider to \ + change this. gettingStarted.step1.title = Change administrator password. gettingStarted.step1.text = Secure your server by changing the default password for the administrator account. \ You can also create new user accounts with different privileges. gettingStarted.step2.title = Set up media folders. -gettingStarted.step2.text = Tell Libresonic where you keep your music and videos. +gettingStarted.step2.text = Tell Airsonic where you keep your music and videos. gettingStarted.step3.title = External Documentation -gettingStarted.step3.text = In the case that you want to enjoy Libresonic remotely, you may want to checkout the \ - proxy documentation \ which provides guidance for setting up SSL, URL rewriting, and custom addresses. Additionally, gettingStarted.hide = Don't show this again gettingStarted.hidealert = To show this screen again, go to Settings > General. @@ -252,8 +252,8 @@ more.random.1month = 1 month ago more.random.3months = 3 months ago more.random.6months = 6 months ago more.random.1year = 1 year ago -more.apps.title = Libresonic Apps -more.apps.text =

            Check out the steadily growing list of Libresonic apps. \ +more.apps.title = Airsonic Apps +more.apps.text =

            Check out the steadily growing list of Airsonic apps. \ These provide fun and alternative ways to enjoy your media collection - no matter where you are. \ Apps are available for Android, iPhone, Windows Phone, BlackBerry, Roku and many more.

            more.status.title = Network Status @@ -306,7 +306,7 @@ upload.unzipped = Unzipped {0} # help.jsp help.title = About {0} help.upgrade = Note! A new version is available. Download {0} {1} \ - here. + here. help.version.title = Version help.builddate.title = Build date help.server.title = Server @@ -316,7 +316,7 @@ help.homepage.title = Homepage help.forum.title = Forum help.shop.title = Merchandise help.contact.title = Contact -help.contact.text = Libresonic is a community project. You can find us in #libresonic on Freenode. Technical issues can be submitted to the Issue Tracker on Github. +help.contact.text = Airsonic is a community project. You can find us in #airsonic on Freenode. Technical issues can be submitted to the Issue Tracker on Github. help.log = Log help.logfile = The complete log is saved in {0}. @@ -450,7 +450,7 @@ musicfoldersettings.fastcache = Fast access mode musicfoldersettings.fastcache.description = Use this option to minimize disk access, for instance if your media files are located on a network disk. \ Note: Changed or added files will only be visible after your media folders are scanned. musicfoldersettings.expunge = Clean-up database -musicfoldersettings.expunge.description = Libresonic stores information about all media files ever encountered. By cleaning up the database, information about \ +musicfoldersettings.expunge.description = Airsonic stores information about all media files ever encountered. By cleaning up the database, information about \ files that are no longer in your media collection is permanently removed. musicfoldersettings.organizebyfolderstructure = Organize by folder structure musicfoldersettings.organizebyfolderstructure.description = Use this option to browse through your media library using the directory structure rather than using artist/album info in ID3 tags. @@ -521,8 +521,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Play music directly in the web browser using the integrated Flash player. playersettings.technology.external.text = Play music in your favorite player, such as WinAmp or Windows Media Player. playersettings.technology.external_with_playlist.text = Same as above, but the playlist is managed by the player, rather \ - than the Libresonic server. In this mode, skipping within songs is possible. -playersettings.technology.jukebox.text = Play music directly on the audio device of the Libresonic server. (Authorized users only). + than the Airsonic server. In this mode, skipping within songs is possible. +playersettings.technology.jukebox.text = Play music directly on the audio device of the Airsonic server. (Authorized users only). playersettings.name = Player name playersettings.maxbitrate = Max bitrate playersettings.notranscoder = Notice: Transcoders does not appear to be installed.
            Click Help button for more information. @@ -535,19 +535,19 @@ playersettings.forget = Delete player playersettings.clone = Clone player dlnasettings.enabled = Enable DLNA server -dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Libresonic, \ +dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Airsonic, \ and stream your media to compatible DLNA players. Requires restart. dlnasettings.servername = Media Server name dlnasettings.servername.description = The name of the Media Server as it will appear in DLNA players. dlnasettings.baselanurl = LAN Server address dlnasettings.lanurl.description = The base LAN address to be used for DLNA resources. \ - An example is http://192.168.0.2/libresonic/ + An example is http://192.168.0.2/airsonic/ sonossettings.enabled = Enable Sonos music service -sonossettings.description = Use this option to turn on the Sonos music service in Libresonic, \ - and stream your media to Sonos devices on your local network. Remember to add Libresonic \ +sonossettings.description = Use this option to turn on the Sonos music service in Airsonic, \ + and stream your media to Sonos devices on your local network. Remember to add Airsonic \ as a music service from your Sonos controller. Visit \ - sonos.libresonic.org for more info. \ + sonos.airsonic.org for more info. \ For trouble-shooting, please see the log. sonossettings.servicename = Music service name sonossettings.servicename.description = The name of the music service as it will appear in the Sonos controller. @@ -600,8 +600,8 @@ usersettings.ok = Password successfully changed for user {0}. # databaseSettings.jsp databasesettings.moreinfo = Additional information on database settings can be read at \ - DATABASE.md on the \ - Libresonic github page. + DATABASE.md on the \ + Airsonic github page. databasesettings.configtype = Database Connection Source databasesettings.mysqlvarcharmaxlength = MySQL Varchar Maximum Length databasesettings.usertablequote = User table Quote @@ -706,7 +706,7 @@ share.facebook = Share on Facebook share.twitter = Share on Twitter share.googleplus = Share on Google+ share.link = Or share this with someone by sending them this link: {0} -share.disabled = To share your music with someone you must first register your own libresonic.org address.
            \ +share.disabled = To share your music with someone you must first register your own airsonic.org address.
            \ Please go to Settings > Network (administrative rights required). share.manage = Manage my shared media @@ -755,7 +755,7 @@ helppopup.mysqlvarcharmaxlength.title = MySQL Varchar Max Length helppopup.mysqlvarcharmaxlength.text =

            MySQL has a maximum row length and as such needs varchar columns to be \ bounded. This value entered here will be the maximum column size.

            helppopup.usertablequote.title = User Table Quote -helppopup.usertablequote.text =

            The Libresonic users table is named user. This may be a keyword conflict in some \ +helppopup.usertablequote.text =

            The Airsonic users table is named user. This may be a keyword conflict in some \ databases such as Postgres. So for postgres, you will want to use the double quote character (") here

            helppopup.jndiname.title = Data Source JNDI Lookup Name helppopup.jndiname.text = A JNDI name to lookup a Data Source of type javax.sql.DataSource. This is something that is\ @@ -764,7 +764,7 @@ helppopup.embeddriver.title = JDBC Driver Class helppopup.embeddriver.text = JDBC Driver dependent class name that implments java.sql.Driver. I.E. for postgres one \ would use org.postgresql.Driver. This class must be present on the classpath. helppopup.playlistfolder.title = Import playlist from -helppopup.playlistfolder.text =

            Libresonic will regularly import playlists stored in this folder.

            +helppopup.playlistfolder.text =

            Airsonic will regularly import playlists stored in this folder.

            helppopup.musicmask.title = Music files helppopup.musicmask.text =

            Allows you to specify the type of files that should be recognized as music.

            helppopup.videomask.title = Video files @@ -856,7 +856,7 @@ helppopup.smtpCredentials.text =

            The credentials to be used to connect to the helppopup.smtpEncryption.title = SMTP Encryption helppopup.smtpEncryption.text =

            The encryption method to be used to connect to the SMTP server. Choose "None" for no encryption.

            helppopup.smtpFrom.title = From address -helppopup.smtpFrom.text =

            The sender address for mails originating from the Libresonic server. Must be a valid e-mail address.

            +helppopup.smtpFrom.text =

            The sender address for mails originating from the Airsonic server. Must be a valid e-mail address.

            helppopup.scanMediaFolders.title = Media folders scanning rules helppopup.scanMediaFolders.text =

            Note that any subfolder whose name starts with a dot (.) or @eaDir is ignored. Also all Thumbs.db files are.

            diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties index 3d036231..1976b1b1 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties @@ -9,11 +9,11 @@ accessDenied.text = Sorry, you are not authorised to perform the requested opera # help.jsp help.license.text = {0} is free software distributed under the GPL open-source licence. \ - {0} uses licensed third-party libraries. Please note that {0} is not \ + {0} uses licensed third-party libraries. Please note that {0} is not \ a tool for illegal distribution of copyrighted material. Always pay attention to and follow the relevant laws specific to your country. # playerSettings.jsp -playersettings.technology.jukebox.text = Play music directly on the audio device of the Libresonic server. (Authorised users only). +playersettings.technology.jukebox.text = Play music directly on the audio device of the Airsonic server. (Authorised users only). # helpPopup.jsp helppopup.musicmask.text =

            Allows you to specify the type of files that should be recognised as music.

            diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties index e1e6bf83..0287f022 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties @@ -38,7 +38,7 @@ top.more = Más top.help = Ayuda top.search = Buscar top.upgrade = Una nueva versión está disponible. Descargar {0} {1} \ - aquí. + aquí. top.missing = No se encuentra ningún directorio de música. Por favor cambie la configuración. top.logout = Desconectar {0} @@ -138,7 +138,7 @@ upload.unzipped = Descomprimido {0} # help.jsp help.title = Sobre {0} help.upgrade = ¡Aviso! Una nueva versión esta disponible. Descargue {0} {1} \ - aquí. + aquí. help.version.title = Versión help.builddate.title = Fecha de creación help.license.title = Licencia @@ -149,7 +149,7 @@ help.contact.title = Contacto help.contact.text = {0} está desarrollado y mantenido por Sindre Mehus \ (sindre@activeobjects.no). \ Si usted tiene alguna pregunta, comentario o sugerencia de mejoras, por favor visite \ - Libresonic Forum. + Airsonic Forum. help.log = Log help.logfile = El log completo esta guardado en {0}. @@ -228,7 +228,7 @@ transcodingsettings.info =

            (%s = El fichero cuyo formato quere necesita espacio en disco.

            \

            El cambio de formato se realiza por medio de programas de linea de comandos de terceros los cuales deben ser instalados en {0}. \ Un pack de windows para el cambio de formato \ - esta disponible aqui. Usted puede añadir su propio programa \ + esta disponible aqui. Usted puede añadir su propio programa \ si cumple los siguientes requisitos: \

              \
            • Debe tener una interface de linea de comandos.
              • \ diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties index f588927b..ab90b4f1 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties @@ -68,7 +68,7 @@ top.more = Rohkem top.help = Info top.search = Otsi top.upgrade = Uuem versioon on saadaval. Lae alla {0} {1} \ - siit. + siit. top.missing = Meediakauste ei leitud. Palun muuda seadeid. top.logout = Logi välja {0} @@ -165,16 +165,16 @@ search.hits.songs = Laulud # gettingStarted.jsp gettingStarted.title = Alustamine -gettingStarted.text =

              Tere tulemast Libresonicusse! Me viime teid kurssi koheselt, selleks tuleb teil järgida antud põhisamme.
              \ +gettingStarted.text =

              Tere tulemast Airsonicusse! Me viime teid kurssi koheselt, selleks tuleb teil järgida antud põhisamme.
              \ Siia lehele naasmiseks kliki nuppu "Kodu" kõrvalolevas tööriistaribal.

              \ -

              Lisainfo saamiseks võtke ühendust Alustamine juhendist.

              -gettingStarted.root = Hoiatus! Libresonicu protsess töötab kasutaja "root" volitusega. Kaaluge selle seade \ - muutmist. +

              Lisainfo saamiseks võtke ühendust Alustamine juhendist.

              +gettingStarted.root = Hoiatus! Airsonicu protsess töötab kasutaja "root" volitusega. Kaaluge selle seade \ + muutmist. gettingStarted.step1.title = Muuda administraatori parooli. gettingStarted.step1.text = Muutke administraatori konto tavaparooli, et server oleks turvatud. \ Saate ka luua uusi kasutajakontosid erinevate juurdepääsudega. gettingStarted.step2.title = Seadista meediakaustad. -gettingStarted.step2.text = Anna Libresonicule teada oma muusika ja videote hoiupaigast. +gettingStarted.step2.text = Anna Airsonicule teada oma muusika ja videote hoiupaigast. gettingStarted.step3.title = Seadista võrguseadeid. gettingStarted.hide = Ära enam kuva seda gettingStarted.hidealert = Kui soovite seda teadet hiljem uuesti kuvada, siis leiate selle valiku alt Seaded > Põhiline. @@ -223,8 +223,8 @@ more.random.year = ja aasta more.random.anyyear = Suvaline more.random.folder = kaustas more.random.anyfolder = Suvaline -more.apps.title = Libresonicu rakendused -more.apps.text =

              Minge uurige uusi ja ägedaid Libresonicu rakendusi. \ +more.apps.title = Airsonicu rakendused +more.apps.text =

              Minge uurige uusi ja ägedaid Airsonicu rakendusi. \ Need teevad sinu meedia kollektsiooni nautimise lõbusamaks ja pakub alternatiivseid viise selleks - asukohast hoolimata. \ Rakendused on saadavad järgmistele nutitelefonidele: Android, iPhone, Windows Phone, BlackBerry, Roku ja paljud teised.

              more.mobile.title = Mobiiltelefon @@ -253,13 +253,13 @@ upload.unzipped = {0} on lahti pakitud # help.jsp help.title = Info {0}´i kohta help.upgrade = Note! Saadaval on uuem versioon. Lae alla {0} {1} \ - siit. + siit. help.version.title = Versioon help.builddate.title = Valmistamiskuupäev help.server.title = Server help.license.title = Kasutajatingimused help.license.text = {0} on vabavaraline tarkvara levitaja GPL avatud lähtekoodiga lepingu alusel. \ - {0} kasutab litsenseeritud kolmanda osapoole lisasid. Pea meeles, et {0} pole \ + {0} kasutab litsenseeritud kolmanda osapoole lisasid. Pea meeles, et {0} pole \ võimalus, mille abil rikutakse autoriõigusi. Alati pane tähele ning järgi oma riigile vastavaid põhiseaduseid. help.homepage.title = Kodulehekülg help.forum.title = Foorum @@ -268,7 +268,7 @@ help.contact.title = Võta ühendust help.contact.text = {0}u arendajaks ja ülalpidajaks on Sindre Mehus \ (sindre@activeobjects.no). \ Kui sul on küsimusi, kommentaare või soovitusi portaali täiustamiseks siis palun külasta \ - Libresonicu foorumit. + Airsonicu foorumit. help.log = Logi help.logfile = Kokkuvõtlik logi on salvestatud asukohta {0}. @@ -383,7 +383,7 @@ musicfoldersettings.fastcache = Kiire sisenemismeetod musicfoldersettings.fastcache.description = Selle valiku valimisel vähendatakse kõvaketta koormust, näiteks, kui sinu meediafailid asuvad interneti serveris. \ Märkus: Failidele jõustuvad muudatused pärast meediakaustade skänneeringut. musicfoldersettings.expunge = Puhastage andmebaasi -musicfoldersettings.expunge.description = Libresonic kogub kõikide siia laetud meediafailide kohta infot. Andmebaasi puhastamise ajal eemaldatakse \ +musicfoldersettings.expunge.description = Airsonic kogub kõikide siia laetud meediafailide kohta infot. Andmebaasi puhastamise ajal eemaldatakse \ ajutiselt nende failide info, mida enam pole Teie muusikakollektsioonis. musicfoldersettings.organizebyfolderstructure = Organiseeri kausta ülesehituse järgi musicfoldersettings.organizebyfolderstructure.description = Kasuta seda valikut, et sirvida oma meediakogu sihtkoha ülesehituse järgi. Selle asemel, et kasutada ID3 teekide esitaja/albumi andmeid. @@ -454,8 +454,8 @@ playersettings.technology.jukebox.title = Kukeboks playersettings.technology.web.text = Kasutage sisseehitatud Flash esitajat, et esitada muusikat otse veebilehitsejast. playersettings.technology.external.text = Esita muusikat oma lemmikesitaja kaudu nagu näiteks WinAmp või Windows Media Player. playersettings.technology.external_with_playlist.text = Sama, mis kõrvalolev aga esitusloendit haldab meediaesitaja, \ - Libresonicu serveri asemel. See olek võimaldab vahele jätta lugusid. -playersettings.technology.jukebox.text = Esita muusikat Libresonicu serveri audioseadme kaudu. (Kinnitatud kasutajaile ainult). + Airsonicu serveri asemel. See olek võimaldab vahele jätta lugusid. +playersettings.technology.jukebox.text = Esita muusikat Airsonicu serveri audioseadme kaudu. (Kinnitatud kasutajaile ainult). playersettings.name = Esitaja nimi playersettings.coverartsize = Albumi esikaane suurus playersettings.maxbitrate = Suurim kvaliteet @@ -472,7 +472,7 @@ playersettings.forget = Kustuta meediaesitaja playersettings.clone = Klooni meediaesitajat dlnasettings.enabled = Luba DLNA server -dlnasettings.description = Selle valikuga on võimalik nähtavaks muuta oma meediakollektsiooni DLNA/UPnP meediaserveri kaudu Libresonicus. \ +dlnasettings.description = Selle valikuga on võimalik nähtavaks muuta oma meediakollektsiooni DLNA/UPnP meediaserveri kaudu Airsonicus. \ Märkus: See võimalus on hetkel testimisel ning ei pruugi töötada kõigi DLNA klientidega. dlnasettings.servername = Meediaserveri nimi dlnasettings.servername.description = Meediaserveri nime kuvatakse DLNA esitajates, et tunneksite ära õige esitaja. @@ -605,7 +605,7 @@ share.facebook = Jaga Facebookis share.twitter = Jaga Twitteris share.googleplus = Jaga Google+-is share.link = Või saatmiseks kasutage linki: {0} -share.disabled = Esmalt, et saaksite muusikat jagada kellegagi, peate te registreerima oma libresonic.org aadressi.
              \ +share.disabled = Esmalt, et saaksite muusikat jagada kellegagi, peate te registreerima oma airsonic.org aadressi.
              \ Palun mine Seaded > Võrk (administraatori õigus on vajalik). share.manage = Halda minu jagatud meediat diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties index fae0a8e6..316b0462 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties @@ -45,7 +45,7 @@ top.more = Lis\u00E4\u00E4 top.help = Tuki top.search = Etsi top.upgrade = Uusi ohjelmaversio on saatavilla. Lataa {0} {1} \ - t\u00E4st\u00E4. + t\u00E4st\u00E4. top.missing = Musiikkikansioita ei l\u00F6ydy. Tarkista asetukset. top.logout = Kirjaa ulos {0} @@ -104,13 +104,13 @@ search.hits.none = Ei osumia. # gettingStarted.jsp gettingStarted.title = Aloitusasetukset -gettingStarted.text =

              Tervetuloa k\u00E4ytt\u00E4m\u00E4\u00E4n Libresonicia! Seuraavaksi k\u00E4yd\u00E4\u00E4n l\u00E4pi perusasetukset.
              \ +gettingStarted.text =

              Tervetuloa k\u00E4ytt\u00E4m\u00E4\u00E4n Airsonicia! Seuraavaksi k\u00E4yd\u00E4\u00E4n l\u00E4pi perusasetukset.
              \ Klikkaa "Etusivu" n\u00E4pp\u00E4int\u00E4 ylh\u00E4\u00E4ll\u00E4 valikossa p\u00E4\u00E4st\u00E4ksesi takaisin t\u00E4lle sivulle.

              gettingStarted.step1.title = Muuta p\u00E4\u00E4k\u00E4ytt\u00E4j\u00E4n salasana. gettingStarted.step1.text = Suojaa serveri muuttamalla p\u00E4\u00E4k\u00E4ytt\u00E4j\u00E4tilin oletussalasana. \ Voit my\u00F6s luoda uusia tilej\u00E4 eri oikeuksin. gettingStarted.step2.title = M\u00E4\u00E4rit\u00E4 musiikkikansioiden sijainti. -gettingStarted.step2.text = M\u00E4\u00E4rit\u00E4 Libresonic-ohjelmalle musiikkikansioiden sijainti. +gettingStarted.step2.text = M\u00E4\u00E4rit\u00E4 Airsonic-ohjelmalle musiikkikansioiden sijainti. gettingStarted.step3.title = M\u00E4\u00E4rit\u00E4 verkkoasetukset. gettingStarted.hide = \u00C4l\u00E4 n\u00E4yt\u00E4 t\u00E4t\u00E4 sivua en\u00E4\u00E4. gettingStarted.hidealert = T\u00E4m\u00E4n sivun saat uudelleen n\u00E4kyviin valitsemalla Asetukset > Yleiset. @@ -177,13 +177,13 @@ upload.unzipped = Purettu {0} # help.jsp help.title = Ohjelma {0} help.upgrade = Huomio! Uusi ohjelmaversio on saatavilla. Lataa {0} {1} \ - t\u00E4st\u00E4. + t\u00E4st\u00E4. help.version.title = Versio help.builddate.title = Build date help.server.title = Serveri help.license.title = Lisenssi help.license.text = {0} is free software distributed under the GPL open-source license. \ - {0} uses licensed third-party libraries. + {0} uses licensed third-party libraries. help.homepage.title = Kotisivu help.forum.title = Foorumi help.shop.title = Oheistuotteet @@ -191,7 +191,7 @@ help.contact.title = Yhteystiedot help.contact.text = {0} ohjelman on kehitt\u00E4nyt ja yll\u00E4pit\u00E4\u00E4 Sindre Mehus \ (sindre@activeobjects.no). \ Jos sinulla on kysytt\u00E4v\u00E4\u00E4, kommentoitavaa tai parannusehdotuksia ohjelmaan, vieraile \ - Libresonic Foorumissa. + Airsonic Foorumissa. help.log = Loki help.logfile = T\u00E4ydellinen loki on tallennettu {0}. @@ -306,9 +306,9 @@ transcodingsettings.info =

              (%s = Tiedosto, mik\u00E4 muunnetaa

              Muuntaminen on prosessi, miss\u00E4 tiedostotyyppi muunnetaan toiseksi tiedostotyypiksi. {1}'ohjelma \ antaa striimata my\u00F6s mediaa, mik\u00E4 normaalisti ei olisi striimattavissa. Muunnos tehd\u00E4\u00E4n lennossa, eik\u00E4 se \ vaadi levytilaa.

              \ -

              Varsinaisen muunnoksen suorittaa kolmannen osapuolen komentoriviohjelma, mik\u00E4 tulee asentaa kansioon c:|libresonic|transcode. \ +

              Varsinaisen muunnoksen suorittaa kolmannen osapuolen komentoriviohjelma, mik\u00E4 tulee asentaa kansioon c:|airsonic|transcode. \ Muunnosohjelma Windowsiin \ - on saatavilla t\u00E4\u00E4lt\u00E4. \ + on saatavilla t\u00E4\u00E4lt\u00E4. \ Voit k\u00E4ytt\u00E4\u00E4 my\u00F6s jotain muuta ohjelmaa jos se t\u00E4ytt\u00E4\u00E4 seuraavat ehdot: \

                \
              • Siin\u00E4 pit\u00E4\u00E4 olla komentorivik\u00E4ytt\u00F6liittym\u00E4.
                • \ @@ -358,8 +358,8 @@ playersettings.technology.jukebox.title = Jukeboksi playersettings.technology.web.text = Toistaa musiikkia suoraan internetselaimessa Flash playerin avulla. playersettings.technology.external.text = Toistaa musiikin suoraan suosikkiohjelmassasi esim. WinAmp tai Windows Media Player. playersettings.technology.external_with_playlist.text = Kuten edelinen, mutta soittolistoja k\u00E4sitell\u00E4\u00E4n suosikkiohjelmassasi, eik\u00E4 \ - Libresonic ohjelmassa. T\u00E4m\u00E4 valinta mahdollistaa kappaleiden yli hypp\u00E4\u00E4misen. -playersettings.technology.jukebox.text = Soita musiikkia suoraan Libresonic serverill\u00E4 olevasta audiol\u00E4hteest\u00E4. (Vain ne k\u00E4ytt\u00E4j\u00E4t, joilla siihen on lupa). + Airsonic ohjelmassa. T\u00E4m\u00E4 valinta mahdollistaa kappaleiden yli hypp\u00E4\u00E4misen. +playersettings.technology.jukebox.text = Soita musiikkia suoraan Airsonic serverill\u00E4 olevasta audiol\u00E4hteest\u00E4. (Vain ne k\u00E4ytt\u00E4j\u00E4t, joilla siihen on lupa). playersettings.name = Soittimen nimi playersettings.coverartsize = Kansikuvan koko playersettings.maxbitrate = Kappaleen maksimi bittivirta diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties index 389b6404..9581e5d1 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties @@ -67,7 +67,7 @@ top.more = Plus top.help = Aide top.search = Rechercher top.upgrade = Une nouvelle version est disponible. T\u00E9l\u00E9charger {0} {1} \ - ici. + ici. top.missing = Aucun fichier trouv\u00E9. Veuillez modifier vos param\u00E8tres. top.logout = Se d\u00E9connecter @@ -162,19 +162,19 @@ search.hits.songs = Titres # gettingStarted.jsp gettingStarted.title = D\u00E9marrage rapide -gettingStarted.text =

                Bienvenue sur Libresonic ! Suivez les quelques \u00E9tapes ci-dessous pour commencer \u00E0 l''utiliser.
                \ +gettingStarted.text =

                Bienvenue sur Airsonic ! Suivez les quelques \u00E9tapes ci-dessous pour commencer \u00E0 l''utiliser.
                \ Cliquez le bouton "Accueil" dans la barre du haut pour revenir sur cette page.

                \ -

                Pour plus d''informations, consultez le guide de d\u00E9marrage rapide.

                +

                Pour plus d''informations, consultez le guide de d\u00E9marrage rapide.

                gettingStarted.step1.title = Changer le mot de passe administrateur. gettingStarted.step1.text = S\u00E9curisez votre installation en modifiant le mot de passe du compte administrateur. \ Vous pouvez aussi cr\u00E9er de nouveaux comptes utilisateurs avec diff\u00E9rents privil\u00E8ges. gettingStarted.step2.title = G\u00E9rer les dossiers de musique. -gettingStarted.step2.text = Libresonic doit savoir dans quel dossier se trouve votre musique. +gettingStarted.step2.text = Airsonic doit savoir dans quel dossier se trouve votre musique. gettingStarted.step3.title = Configurer les r\u00E9glages r\u00E9seau. gettingStarted.hide = Ne plus montrer cet \u00E9cran gettingStarted.hidealert = Pour afficher cet \u00E9cran \u00E0 nouveau, allez dans Param\u00E8tres > G\u00E9n\u00E9ral. -gettingStarted.root = Attention ! Le processus de libresonic a \u00E9t\u00E9 lanc\u00E9 par l''utilisateur root. Nous vous conseillons de \ - modifier ce point. +gettingStarted.root = Attention ! Le processus de airsonic a \u00E9t\u00E9 lanc\u00E9 par l''utilisateur root. Nous vous conseillons de \ + modifier ce point. # home.jsp home.random.title = Al\u00E9atoire @@ -217,7 +217,7 @@ more.random.anyyear = Toutes les ann\u00E9es more.random.folder = et du dossier more.random.anyfolder = Tous les dossiers more.apps.title = Applications -more.apps.text = Des applications Libresonic sont disponibles pour iPhone, \ +more.apps.text = Des applications Airsonic sont disponibles pour iPhone, \ Android et AIR. more.mobile.title = T\u00E9l\u00E9phone mobile more.mobile.text =

                Vous pouvez controler {0} \u00E0 partir de votre t\u00E9l\u00E9phone mobile.
                \ @@ -243,13 +243,13 @@ upload.unzipped = D\u00E9compress\u00E9 {0} # help.jsp help.title = A propos de {0} help.upgrade = Note! Une nouvelle version est disponible. T\u00E9l\u00E9charger {0} {1} \ - ici. + ici. help.version.title = Version help.builddate.title = Date help.server.title = Serveur help.license.title = Licence help.license.text = {0} est un logiciel gratuit distribu\u00E9 sous licence GPL. \ - {0} utilise une biblioth\u00E8que tiers autoris\u00E9e. Veuillez noter qu''il n''est pas \ + {0} utilise une biblioth\u00E8que tiers autoris\u00E9e. Veuillez noter qu''il n''est pas \ destin\u00E9 \u00E0 partager ill\u00E9galement des oeuvres non-libres de droit. Renseignez-vous sur les lois en vigueur dans votre pays. help.homepage.title = Page d'accueil help.forum.title = Forum @@ -258,7 +258,7 @@ help.contact.title = Contact help.contact.text = {0} est developp\u00E9 et maintenu par Sindre Mehus \ (sindre@activeobjects.no). \ Si vous avez des questions, commentaires ou suggestions pour l''am\u00E9liorer, visitez le \ - Forum Libresonic. + Forum Airsonic. help.log = Log help.logfile = L''historique complet est sauvegard\u00E9e dans {0}. @@ -375,9 +375,9 @@ transcodingsettings.info =

                (%s = Le fichier \u00E0 encoder, %b

                L''encodage est un processus de conversion d''un format de fichier vers un autre. Le moteur d''encodage de {1} \ permet de lire un fichier qui normalement n''aurait pas pu l''\u00EAtre. L''encodage est effectu\u00E9 \u00E0 la vol\u00E9e et ne \ requiert aucun usage du disque dur.

                \ -

                L''encodage peut se faire en ligne de commande \u00E0 l''aide d'un programme tiers qui peut \u00EAtre install\u00E9 dans Libresonic. \ +

                L''encodage peut se faire en ligne de commande \u00E0 l''aide d'un programme tiers qui peut \u00EAtre install\u00E9 dans Airsonic. \ Un pack d''encodage pour Windows \ - est disponible ici. Vous pouvez ajouter votre propre encodeur \ + est disponible ici. Vous pouvez ajouter votre propre encodeur \ s''il remplit les conditions suivantes : \

                  \
                • avoir une interface en ligne de commande.
                  • \ @@ -425,9 +425,9 @@ playersettings.technology.external_with_playlist.title = Lecteur externe avec pl playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Joue la musique directement dans le navigateur avec le lecteur flash int\u00E9gr\u00E9. playersettings.technology.external.text = Joue la musique dans votre lecteur favori (Winamp, Windows Media Player ou autre). -playersettings.technology.external_with_playlist.text = Comme ci-dessus, la playlist est g\u00E9r\u00E9e par le lecteur et non par Libresonic. \ +playersettings.technology.external_with_playlist.text = Comme ci-dessus, la playlist est g\u00E9r\u00E9e par le lecteur et non par Airsonic. \ Avec ce mode, sauter une chanson est possible pendant l'\u00E9coute. -playersettings.technology.jukebox.text = Joue la musique directement sur le lecteur du serveur Libresonic. (Utilisateurs autoris\u00E9s uniquement). +playersettings.technology.jukebox.text = Joue la musique directement sur le lecteur du serveur Airsonic. (Utilisateurs autoris\u00E9s uniquement). playersettings.name = Nom du lecteur playersettings.coverartsize = Taille des jaquettes playersettings.maxbitrate = Vitesse maximum @@ -622,11 +622,11 @@ helppopup.downloadlimit.text =

                  Permet de limiter l''utilisation de la bande p helppopup.uploadlimit.title = Limite d''envoi helppopup.uploadlimit.text =

                  Permet de limiter l''utilisation de la bande passante pour les envois de fichiers.

                  helppopup.streamport.title = Port pour les flux non-SSL -helppopup.streamport.text =

                  Cette option n''est utile que si vous utilisez Libresonic sur un serveur utilisant la technologie SSL (HTTPS).

                  Certain lecteurs \ +helppopup.streamport.text =

                  Cette option n''est utile que si vous utilisez Airsonic sur un serveur utilisant la technologie SSL (HTTPS).

                  Certain lecteurs \ (comme Winamp) ne supportent pas le streaming par SSL. Si vous ne voulez pas que le flux soit transmis par SSL, indiquez un num\u00E9ro de port pour une utilisation http (g\u00E9n\u00E9ralement 80 ou 4040). Notez que ce flux ne sera pas crypt\u00E9.

                  helppopup.ldap.title = Authentification LDAP helppopup.ldap.text =

                  Les utilisateurs peuvent \u00EAtre authentifi\u00E9s par un serveur LDAP externe (dont Windows Active Directory). \ - Quand ces utilisateurs se connectent sur Libresonic, leur nom d''utilisateur et mot de passe sont v\u00E9rifi\u00E9s par le serveur externe et non par Libresonic.

                  + Quand ces utilisateurs se connectent sur Airsonic, leur nom d''utilisateur et mot de passe sont v\u00E9rifi\u00E9s par le serveur externe et non par Airsonic.

                  helppopup.ldapurl.title = LDAP URL helppopup.ldapurl.text =

                  Permet d''indiquer l''URL du serveur LDAP. Le protocole sera ldap :// ou ldaps:// \ (pour LDAP par SSL). Voir ici \ diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties index bcacf1ac..3217633e 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties @@ -45,7 +45,7 @@ top.more = Meira top.help = Hj\u00E1lp top.search = Leita top.upgrade = N\u00FDrri \u00DAtg\u00E1fa er tilb\u00FAin. S\u00E6kja {0} {1} \ - H\u00E9r. + H\u00E9r. top.missing = Engar T\u00F3nlistarskr\u00E1r Fundust. Vinsamlegast Breyttu Stillingunum. top.logout = \u00DAtskr\u00E1 {0} @@ -164,13 +164,13 @@ upload.unzipped = Af\u00FEjappa\u00F0 {0} # help.jsp help.title = Um {0} help.upgrade = A.T.H! N\u00FDrri \u00DAtg\u00E1fa er tilb\u00FAin.
                  S\u00E6kja {0} {1} \ - H\u00E9r. + H\u00E9r. help.version.title = \u00DAtg\u00E1fa help.builddate.title = Sm\u00ED\u00F0i Dags help.server.title = \u00DEj\u00F3nn help.license.title = Leifi help.license.text = {0} er \u00F3keypis hugb\u00FAna\u00F0i er dreift samkv\u00E6mt GPL open-source license. \ - {0} Nota\u00F0u licensed third-party libraries. + {0} Nota\u00F0u licensed third-party libraries. help.homepage.title = Heimas\u00ED\u00F0a help.forum.title = Spjallbor\u00F0 help.shop.title = V\u00F6rur @@ -178,7 +178,7 @@ help.contact.title = Hafa Samband help.contact.text = {0} er \u00FEr\u00F3a\u00F0 og vi\u00F0haldi\u00F0 af Sindre Mehus \ (sindre@activeobjects.no). \ Ef \u00FE\u00FA hefur einhverjar spurningar, athugasemdir e\u00F0a till\u00F6gur til \u00FArb\u00F3ta, skaltu fara \u00E1 \ - Libresonic Spjallbor\u00F0. + Airsonic Spjallbor\u00F0. help.log = Yfirlit help.logfile = Tilb\u00FAi\u00F0 Yfirlit er Vista\u00F0 \u00ED {0}. @@ -292,7 +292,7 @@ transcodingsettings.info =

                  (%s = Eftirfarandi Skr\u0 \u00FEurfa allir diskur notkun.

                  \

                  raunverulegur transcoding er gert vi\u00F0 \u00FEri\u00F0ja a\u00F0ila stj\u00F3rn l\u00EDna forrit ver\u00F0ur a\u00F0 vera uppsett \u00ED {0}. \ transcoding Pakki Fyrir Windows \ - F\u00E6st H\u00E9r. \u00DE\u00FA getur b\u00E6tt eigin s\u00E9rsni\u00F0num transcoder \u00FEinn gefi\u00F0 \u00FEa\u00F0 \ + F\u00E6st H\u00E9r. \u00DE\u00FA getur b\u00E6tt eigin s\u00E9rsni\u00F0num transcoder \u00FEinn gefi\u00F0 \u00FEa\u00F0 \ fulln\u00E6gja eftirfarandi kr\u00F6fum: \

                    \
                  • \u00DEa\u00F0 ver\u00F0ur a\u00F0 hafa stj\u00F3rn l\u00EDna tengi.
                    • \ @@ -342,8 +342,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Spila t\u00F3nlist beint \u00ED the vefur flettit\u00E6ki me\u00F0 sam\u00FE\u00E6tta Flash player. playersettings.technology.external.text = Spila t\u00F3nlist \u00ED upp\u00E1halds leikma\u00F0ur, svo sem WinAmp e\u00F0a Windows Media Player. playersettings.technology.external_with_playlist.text = Sama og a\u00F0 ofan, en lagalista er stj\u00F3rna\u00F0 af the leikma\u00F0ur, frekar \ - en Libresonic framrei\u00F0sluma\u00F0ur. \u00CD \u00FEessari stillingu, skipstj\u00F3ri \u00E1 l\u00F6gin er h\u00E6gt. -playersettings.technology.jukebox.text = Spila t\u00F3nlist beint \u00E1 the hlj\u00F3mflutnings-t\u00E6ki \u00E1 Libresonic mi\u00F0lara. (Heimila\u00F0ur notendur). + en Airsonic framrei\u00F0sluma\u00F0ur. \u00CD \u00FEessari stillingu, skipstj\u00F3ri \u00E1 l\u00F6gin er h\u00E6gt. +playersettings.technology.jukebox.text = Spila t\u00F3nlist beint \u00E1 the hlj\u00F3mflutnings-t\u00E6ki \u00E1 Airsonic mi\u00F0lara. (Heimila\u00F0ur notendur). playersettings.name = Nafn Spilara playersettings.coverartsize = Fela Art St\u00E6r\u00F0 playersettings.maxbitrate = Mest G\u00E6\u00F0i diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties index 6152b87a..595a5136 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties @@ -45,7 +45,7 @@ top.more = Di pi\u00F9 top.help = Aiuto top.search = Ricerca top.upgrade = E' disponibile una nuova versione. Scaricala {0} {1} \ - qui. + qui. top.missing = Non \u00E8 stata trovata nessuna cartella contenente musica, verifica le impostazioni. top.logout = Esci {0} @@ -108,15 +108,15 @@ search.hits.albums = Album search.hits.songs = Canzoni # gettingStarted.jsp -gettingStarted.title = Comincia ad utilizzare Libresonic -gettingStarted.text =

                    Benvenuto in Libresonic! La configurazione non ti porter\u00E0 via tempo, baster\u00E0 seguire i semplici passaggi riportati di seguito.
                    \ +gettingStarted.title = Comincia ad utilizzare Airsonic +gettingStarted.text =

                    Benvenuto in Airsonic! La configurazione non ti porter\u00E0 via tempo, baster\u00E0 seguire i semplici passaggi riportati di seguito.
                    \ Premi il bottone "Casa" nella barra degl strumenti qui sopra per tornare a questa schermata.

                    \ -

                    Per maggiori informazioni, per favore consulta la guida Comincia ad utilizzare Libresonic.

                    +

                    Per maggiori informazioni, per favore consulta la guida Comincia ad utilizzare Airsonic.

                    gettingStarted.step1.title = Cambia la password di amministrazione. gettingStarted.step1.text = Cambiando la password predefinita dell'utente di amministrazione renderai pi\u00F9 sicuro il tuo server. \ Puoi anche scegliere di creare un altro utente con differenti privilegi di amministrazione. gettingStarted.step2.title = Imposta le cartelle della musica. -gettingStarted.step2.text = Di' a Libresonic dove tieni la tua musica. +gettingStarted.step2.text = Di' a Airsonic dove tieni la tua musica. gettingStarted.step3.title = Configura le imposatzioni di rete. gettingStarted.hide = Non mostrare questa schermata di nuovo. gettingStarted.hidealert = Per visualizzare nuovamente la schermata, vai in Impostazioni > Generale. @@ -158,8 +158,8 @@ more.random.year = e anno more.random.anyyear = Qualsiasi more.random.folder = nella cartella more.random.anyfolder = Qualsiasi -more.apps.title = Applicazioni Libresonic -more.apps.text =

                    Le applicazioni Libresonic sono disponibili per iPhone, \ +more.apps.title = Applicazioni Airsonic +more.apps.text =

                    Le applicazioni Airsonic sono disponibili per iPhone, \ Android e AIR.

                    more.mobile.title = Telefono cellulare more.mobile.text =

                    Puoi controllare {0} da qualsiasi telefono cellulare o PDA con WAP abilitato.
                    \ @@ -188,13 +188,13 @@ upload.unzipped = Zip estratto {0} # help.jsp help.title = Riguardo {0} help.upgrade = Attenzione! Una nuova versione \u00E8 disponibile. Scaricala {0} {1} \ - qui. + qui. help.version.title = Versione help.builddate.title = Data di build help.server.title = Server help.license.title = Termini di utilizzo help.license.text = {0} \u00E8 un software libero distribuito sotto i termini della licenza open source GPL. \ - {0} utilizza librerie autorizzate di terze parti. Per favore ricorda che {0} non \u00E8 \ + {0} utilizza librerie autorizzate di terze parti. Per favore ricorda che {0} non \u00E8 \ uno strumento per la distribuzione illegale di materiale coperto dal diritto d'autore. Rispetta sempre le disciplina legale pertinente per il tuo Paese. help.homepage.title = Homepage help.forum.title = Forum @@ -203,7 +203,7 @@ help.contact.title = Contatti help.contact.text = {0} \u00E8 sviluppato e mantenuto da Sindre Mehus \ (sindre@activeobjects.no). \ Se hai domande, commenti o suggerimenti per migliorare il programma, visita il \ - Forum di Libresonic. + Forum di Airsonic. help.log = Log help.logfile = Il file di log completo \u00E8 salvato in {0}. @@ -320,7 +320,7 @@ transcodingsettings.info =

                    (%s = File da convertire, %b = Bitr necessita di alcun utilizzo del disco.

                    \

                    Attualmente il transcoding attuale \u00E8 fatto da programmi a linea di comando di terze parti, che, dunque, devono essere installati in {0}. \ Un pacchetto di Transcofing per Windows \ - \u00E8 disponibile qui. Puoi aggiungere i tuoi transcoder personalizzati \ + \u00E8 disponibile qui. Puoi aggiungere i tuoi transcoder personalizzati \ purch\u00E9 soddisfino i seguenti requisiti: \

                      \
                    • Devono avere una interfaccia a linea di comando.
                      • \ @@ -369,8 +369,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Riproduci la musica direttamente dal web browser utilizzando il riproduttore Flash integrato. playersettings.technology.external.text = Riproduci la musica nel tuo programma di riproduzione preferito, come WinAmp o Windows Media Player. playersettings.technology.external_with_playlist.text = Come sopra, ma la lista di riproduzione \u00E8 gestita dal programma di riproduzione, invece \ - che dal server Libresonic. In questa modalit\u00E0 \u00E8 possibile passare da una canzone all'altra. -playersettings.technology.jukebox.text = Riproduci la musica direttamente dalla macchina su cui \u00E8 installato il sever di Libresonic. (Solo utenti autorizzati). + che dal server Airsonic. In questa modalit\u00E0 \u00E8 possibile passare da una canzone all'altra. +playersettings.technology.jukebox.text = Riproduci la musica direttamente dalla macchina su cui \u00E8 installato il sever di Airsonic. (Solo utenti autorizzati). playersettings.name = Nome Riproduttore playersettings.coverartsize = Dimensione delle copertine playersettings.maxbitrate = Bitrate massimo diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties index 6eb65464..ff24cd82 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties @@ -69,7 +69,7 @@ top.more = \u305D\u306E\u4ED6 top.help = \u30D8\u30EB\u30D7 top.search = \u691C\u7D22 top.upgrade = \u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u30EA\u30EA\u30FC\u30B9\u3055\u308C\u3066\u3044\u307E\u3059\u3002{0} {1} \ - \u3092\u3053\u3053\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u304F\u3060\u3055\u3044\u3002 + \u3092\u3053\u3053\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u304F\u3060\u3055\u3044\u3002 top.missing = \u97F3\u697D\u30D5\u30A9\u30EB\u30C0\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u8A2D\u5B9A\u3092\u898B\u76F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002 top.logout = {0} \u3092\u30ED\u30B0\u30A2\u30A6\u30C8\u3059\u308B @@ -172,11 +172,11 @@ search.hits.videos = \u30D3\u30C7\u30AA # gettingStarted.jsp gettingStarted.title = \u306F\u3058\u3081\u306B -gettingStarted.text =

                      \u3088\u3046\u3053\u305D Libresonic\u3078! \u4E0B\u8A18\u306E\u624B\u9806\u3067\u57FA\u672C\u7684\u306A\u8A2D\u5B9A\u304C\u3067\u304D\u307E\u3059\u3002
                      \ +gettingStarted.text =

                      \u3088\u3046\u3053\u305D Airsonic\u3078! \u4E0B\u8A18\u306E\u624B\u9806\u3067\u57FA\u672C\u7684\u306A\u8A2D\u5B9A\u304C\u3067\u304D\u307E\u3059\u3002
                      \ \u3053\u306E\u753B\u9762\u306B\u623B\u308B\u306B\u306F\u3001\u4E0A\u306B\u3042\u308B\u30C4\u30FC\u30EB\u30D0\u30FC\u306E\u300C\u30DB\u30FC\u30E0\u300D\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002

                      \ -

                      \u8A73\u7D30\u306B\u3064\u3044\u3066\u306F\u3001Getting started \u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002

                      -gettingStarted.root = \u8B66\u544A! Libresonic \u306E\u30D7\u30ED\u30BB\u30B9\u304C\u30EB\u30FC\u30C8\u6A29\u9650\u3067\u5B9F\u884C\u3055\u308C\u3066\u3044\u307E\u3059\u3002\ - \u3053\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +

                      \u8A73\u7D30\u306B\u3064\u3044\u3066\u306F\u3001Getting started \u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002

                      +gettingStarted.root = \u8B66\u544A! Airsonic \u306E\u30D7\u30ED\u30BB\u30B9\u304C\u30EB\u30FC\u30C8\u6A29\u9650\u3067\u5B9F\u884C\u3055\u308C\u3066\u3044\u307E\u3059\u3002\ + \u3053\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u3053\u3068\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 gettingStarted.step1.title = \u7BA1\u7406\u8005\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059\u3002 gettingStarted.step1.text = \u7BA1\u7406\u8005\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3059\u308B\u3053\u3068\u3067\u3001\u30B5\u30FC\u30D0\u3092\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u3092\u9AD8\u3081\u3066\u304F\u3060\u3055\u3044\u3002 \ \u307E\u305F\u3001\u5225\u306E\u6A29\u9650\u3092\u6301\u3064\u65B0\u3057\u3044\u30E6\u30FC\u30B6\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u4F5C\u6210\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002 @@ -231,8 +231,8 @@ more.random.year = \u5E74\u4EE3: more.random.anyyear = \u4EFB\u610F more.random.folder = \u30D5\u30A9\u30EB\u30C0: more.random.anyfolder = \u4EFB\u610F -more.apps.title = Libresonic Apps -more.apps.text =

                      Libresonic apps \u306E\u5145\u5B9F\u306B\u6CE8\u76EE\u3057\u3066\u3044\u3066\u304F\u3060\u3055\u3044\u3002\ +more.apps.title = Airsonic Apps +more.apps.text =

                      Airsonic apps \u306E\u5145\u5B9F\u306B\u6CE8\u76EE\u3057\u3066\u3044\u3066\u304F\u3060\u3055\u3044\u3002\ \u3053\u308C\u3089\u306E\u30A2\u30D7\u30EA\u7FA4\u306F\u3001\u305F\u3068\u3048\u3042\u306A\u305F\u304C\u3069\u3053\u306B\u3044\u3066\u3082\u97F3\u697D\u3092\u697D\u3057\u3080\u559C\u3073\u3068\u69D8\u3005\u306A\u624B\u6BB5\u3092\u63D0\u4F9B\u3057\u307E\u3059\u3002\ \u30A2\u30D7\u30EA\u306F Android, iPhone, Windows Phone, BlackBerry, Roku, \u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\u3002

                      more.status.title = \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u72B6\u614B @@ -263,15 +263,15 @@ upload.unzipped = zip\u30D5\u30A1\u30A4\u30EB {0} \u3092\u5C55\u958B\u3057\u307E # help.jsp help.title = {0} \u306B\u3064\u3044\u3066 help.upgrade = \u6CE8\u610F! \u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u30EA\u30EA\u30FC\u30B9\u3055\u308C\u3066\u3044\u307E\u3059\u3002
                      {0} {1} \ - \u3092\u3053\u3053\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u304F\u3060\u3055\u3044\u3002 + \u3092\u3053\u3053\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u304F\u3060\u3055\u3044\u3002 help.version.title = \u30D0\u30FC\u30B8\u30E7\u30F3 help.builddate.title = \u30D3\u30EB\u30C9\u65E5 help.server.title = \u30B5\u30FC\u30D0 help.license.title = \u30E9\u30A4\u30BB\u30F3\u30B9 help.license.text = {0} \u306F GPL \u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u4E0B\u306B\u914D\u5E03\u3055\u308C\u308B\u30D5\u30EA\u30FC\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u3067\u3059\u3002 \ - {0} \u306F \u30B5\u30FC\u30C9\u30D1\u30FC\u30C6\u30A3\u306E\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u5404\u3005\u306E\u30E9\u30A4\u30BB\u30F3\u30B9\u306B\u5247\u3063\u3066\u5229\u7528\u3057\u3066\u3044\u307E\u3059\u3002
                      \ + {0} \u306F \u30B5\u30FC\u30C9\u30D1\u30FC\u30C6\u30A3\u306E\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u5404\u3005\u306E\u30E9\u30A4\u30BB\u30F3\u30B9\u306B\u5247\u3063\u3066\u5229\u7528\u3057\u3066\u3044\u307E\u3059\u3002
                      \ {0} is free software distributed under the GPL open-source license. \ - {0} uses licensed third-party libraries. + {0} uses licensed third-party libraries. help.homepage.title = \u30DB\u30FC\u30E0\u30DA\u30FC\u30B8 help.forum.title = \u30D5\u30A9\u30FC\u30E9\u30E0 help.shop.title = \u30B7\u30E7\u30C3\u30D7 @@ -279,11 +279,11 @@ help.contact.title = \u9023\u7D61\u65B9\u6CD5 help.contact.text = {0} \u306F Sindre Mehus (sindre@activeobjects.no) \ \u306B\u3088\u3063\u3066\u958B\u767A\u30FB\u30E1\u30F3\u30C6\u30CA\u30F3\u30B9\u3055\u308C\u3066\u3044\u307E\u3059\u3002\ \u8CEA\u554F\u3084\u30B3\u30E1\u30F3\u30C8\u3001\u610F\u898B\u3001\u6539\u5584\u6848\u304C\u3042\u308C\u3070 \ - \u30D5\u30A9\u30FC\u30E9\u30E0\u3078\u3069\u3046\u305E\u3002
                      \ + \u30D5\u30A9\u30FC\u30E9\u30E0\u3078\u3069\u3046\u305E\u3002
                      \ {0} is developed and maintained by Sindre Mehus \ (sindre@activeobjects.no). \ If you have any questions, comments or suggestions for improvements, please visit the \ - Libresonic Forum. + Airsonic Forum. help.log = \u30ED\u30B0 help.logfile = \u30ED\u30B0\u306E\u6700\u7D42\u66F4\u65B0\u6642\u9593: {0} @@ -405,7 +405,7 @@ musicfoldersettings.fastcache = \u9AD8\u901F\u30A2\u30AF\u30BB\u30B9\u30E2\u30FC musicfoldersettings.fastcache.description = \u97F3\u697D\u30D5\u30A1\u30A4\u30EB\u304C\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30C7\u30A3\u30B9\u30AF\u4E0A\u306B\u3042\u308B\u5834\u5408\u3001\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3088\u3063\u3066\u30C7\u30A3\u30B9\u30AF\u30A2\u30AF\u30BB\u30B9\u3092\u6700\u5C0F\u9650\u306B\u6291\u3048\u3089\u308C\u307E\u3059\u3002 \ \u6CE8: \u97F3\u697D\u30D5\u30A9\u30EB\u30C0\u306E\u30B9\u30AD\u30E3\u30F3\u5F8C\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002 musicfoldersettings.expunge = \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7 -musicfoldersettings.expunge.description = Libresonic \u306F\u4ECA\u307E\u3067\u306B\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3057\u305F\u97F3\u697D\u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u683C\u7D0D\u3057\u3066\u3044\u307E\u3059\u3002\ +musicfoldersettings.expunge.description = Airsonic \u306F\u4ECA\u307E\u3067\u306B\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3057\u305F\u97F3\u697D\u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u683C\u7D0D\u3057\u3066\u3044\u307E\u3059\u3002\ \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7\u3059\u308B\u3053\u3068\u3067\u3001\u4E0D\u8981\u306A\u97F3\u697D\u30D5\u30A1\u30A4\u30EB\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u524A\u9664\u3057\u307E\u3059\u3002 musicfoldersettings.organizebyfolderstructure = \u30D5\u30A9\u30EB\u30C0\u69CB\u9020\u3067\u6574\u7406 musicfoldersettings.organizebyfolderstructure.description = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u69CB\u9020\u3092\u4F7F\u7528\u305B\u305A\u3001ID3\u30BF\u30B0\u306B\u8A18\u8F09\u3055\u308C\u305F\u30A2\u30FC\u30C6\u30A3\u30B9\u30C8\u30FB\u30A2\u30EB\u30D0\u30E0\u60C5\u5831\u3092\u4F7F\u7528\u3057\u3066\u30E1\u30C7\u30A3\u30A2\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u95B2\u89A7\u3059\u308B\u306B\u306F\u3001\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002 @@ -429,7 +429,7 @@ transcodingsettings.info =

                      (%s = \u5909\u63DB\u5143\u30D5\u30A \u672C\u6765\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u518D\u751F\u306B\u5BFE\u5FDC\u3057\u3066\u3044\u306A\u3044\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306E\u66F2\u3067\u3082\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u518D\u751F\u3067\u304D\u308B\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002 \ \u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u306F\u5FC5\u8981\u306B\u5FDC\u3058\u3066\u305D\u306E\u90FD\u5EA6\u884C\u308F\u308C\u3001\u30C7\u30A3\u30B9\u30AF\u5BB9\u91CF\u306F\u6D88\u8CBB\u3057\u307E\u305B\u3093\u3002

                      \

                      \u5B9F\u969B\u306E\u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u4F5C\u696D\u3092\u884C\u3046\u30B5\u30FC\u30C9\u30D1\u30FC\u30C6\u30A3\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u306F\u3001 {0} \u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304A\u304F\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\ - Windows\u3067\u306F \u3053\u3053 \ + Windows\u3067\u306F \u3053\u3053 \ \u304B\u3089\u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7528\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u30D1\u30C3\u30AF\u3092\u5165\u624B\u3067\u304D\u307E\u3059\u3002\ \u307E\u305F\u3001\u6B21\u306E\u8981\u6C42\u6A5F\u80FD\u3092\u6E80\u305F\u305B\u3070\u72EC\u81EA\u306E\u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C0\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\

                        \ @@ -480,7 +480,7 @@ playersettings.technology.web.text = \u30D6\u30E9\u30A6\u30B6\u4E0A\u3067Flash \ playersettings.technology.external.text = \u4EFB\u610F\u306E\u5916\u90E8\u30D7\u30EC\u30FC\u30E4 (Winamp \u3084 Windows Media Player \u306A\u3069) \u3067\u518D\u751F\u3057\u307E\u3059\u3002 playersettings.technology.external_with_playlist.text = \u540C\u4E0A\u3002\u305F\u3060\u3057\u30D7\u30EC\u30A4\u30EA\u30B9\u30C8\u3054\u3068\u5916\u90E8\u30D7\u30EC\u30FC\u30E4\u304C\u7BA1\u7406\u3057\u307E\u3059\u3002\ \u66F2\u306E\u30B9\u30AD\u30C3\u30D7\u304C\u53EF\u80FD\u306B\u306A\u308A\u307E\u3059\u3002 -playersettings.technology.jukebox.text = Libresonic \u30B5\u30FC\u30D0\u306E\u30AA\u30FC\u30C7\u30A3\u30AA\u30C7\u30D0\u30A4\u30B9\u3092\u7528\u3044\u3066\u76F4\u63A5\u518D\u751F\u3057\u307E\u3059\u3002\u76F8\u5FDC\u306E\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\u3002 +playersettings.technology.jukebox.text = Airsonic \u30B5\u30FC\u30D0\u306E\u30AA\u30FC\u30C7\u30A3\u30AA\u30C7\u30D0\u30A4\u30B9\u3092\u7528\u3044\u3066\u76F4\u63A5\u518D\u751F\u3057\u307E\u3059\u3002\u76F8\u5FDC\u306E\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059\u3002 playersettings.name = \u30D7\u30EC\u30FC\u30E4\u540D playersettings.coverartsize = \u30A2\u30FC\u30C8\u30EF\u30FC\u30AF\u753B\u50CF\u306E\u30B5\u30A4\u30BA playersettings.maxbitrate = \u6700\u5927\u30D3\u30C3\u30C8\u30EC\u30FC\u30C8 @@ -497,7 +497,7 @@ playersettings.forget = \u30D7\u30EC\u30FC\u30E4\u306E\u524A\u9664 playersettings.clone = \u30D7\u30EC\u30FC\u30E4\u306E\u8907\u88FD dlnasettings.enabled = DLNA \u30B5\u30FC\u30D0\u3092\u6709\u52B9\u306B\u3059\u308B -dlnasettings.description = \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068 Libresonic \u306E DLNA/UPnP \u30E1\u30C7\u30A3\u30A2\u30B5\u30FC\u30D0\u6A5F\u80FD\u3092\u4F5C\u52D5\u3055\u305B\u3001\ +dlnasettings.description = \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u3068 Airsonic \u306E DLNA/UPnP \u30E1\u30C7\u30A3\u30A2\u30B5\u30FC\u30D0\u6A5F\u80FD\u3092\u4F5C\u52D5\u3055\u305B\u3001\ DLNA \u4E92\u63DB\u30D7\u30EC\u30A4\u30E4\u3067\u97F3\u697D\u3084\u6620\u50CF\u3092\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u518D\u751F\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002 dlnasettings.servername = \u30E1\u30C7\u30A3\u30A2\u30B5\u30FC\u30D0\u540D dlnasettings.servername.description = \u305D\u308C\u306FDLNA\u30D7\u30EC\u30FC\u30E4\u306B\u8868\u793A\u3055\u308C\u308B\u30E1\u30C7\u30A3\u30A2\u30B5\u30FC\u30D0\u540D\u3067\u3059\u3002 @@ -506,9 +506,9 @@ sonossettings.enabled = Sonos\u306E\u30DF\u30E5\u30FC\u30B8\u30C3\u30AF\u30B5\u3 sonossettings.description = Sonos \u306E\u30DF\u30E5\u30FC\u30B8\u30C3\u30AF\u30B5\u30FC\u30D3\u30B9\u3092\u5229\u7528\u3059\u308B\u306B\u306F\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3001 \ \u30ED\u30FC\u30AB\u30EB\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u4E0A\u306E Sonos \u30C7\u30D0\u30A4\u30B9\u306B\u97F3\u697D\u3092\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u3057\u3066\u304F\u3060\u3055\u3044\u3002\ Sonos \u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9\u304B\u3089\u30DF\u30E5\u30FC\u30B8\u30C3\u30AF\u30B5\u30FC\u30D3\u30B9\u3068\u3057\u3066 \ - Libresonic \u3092\u52A0\u3048\u308B\u3053\u3068\u3092\u5FD8\u308C\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\ + Airsonic \u3092\u52A0\u3048\u308B\u3053\u3068\u3092\u5FD8\u308C\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\ \u3082\u3063\u3068\u591A\u304F\u306E\u60C5\u5831\u3084\u30C8\u30E9\u30D6\u30EB\u30B7\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0\u304C\u5FC5\u8981\u306A\u3089 \ - sonos.libresonic.org \ + sonos.airsonic.org \ \u3092\u8A2A\u554F\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30ED\u30B0\u3092\u78BA\u8A8D\u3059\u308B\u3053\u3068\u3082\u304A\u3059\u3059\u3081\u3057\u307E\u3059\u3002 sonossettings.servicename = \u30DF\u30E5\u30FC\u30B8\u30C3\u30AF\u30B5\u30FC\u30D3\u30B9\u540D sonossettings.servicename.description = \u305D\u308C\u306FSonos\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9\u30FC\u306B\u8868\u793A\u3055\u308C\u308B\u97F3\u697D\u30B5\u30FC\u30D3\u30B9\u306E\u540D\u524D\u3067\u3059\u3002 @@ -648,7 +648,7 @@ share.facebook = Facebook \u3067\u5171\u6709 share.twitter = Twitter \u3067\u5171\u6709 share.googleplus = Google+ \u3067\u5171\u6709 share.link = \u307E\u305F\u306F\u6B21\u306E\u30EA\u30F3\u30AF\u3092\u9001\u308B\u3053\u3068\u3067\u5171\u6709: {0} -share.disabled = \u3042\u306A\u305F\u306E\u66F2\u3092\u8AB0\u304B\u3068\u5171\u6709\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u3042\u306A\u305F\u56FA\u6709\u306Elibresonic.org \u30A2\u30C9\u30EC\u30B9\u3092\u767B\u9332\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
                        \ +share.disabled = \u3042\u306A\u305F\u306E\u66F2\u3092\u8AB0\u304B\u3068\u5171\u6709\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u3042\u306A\u305F\u56FA\u6709\u306Eairsonic.org \u30A2\u30C9\u30EC\u30B9\u3092\u767B\u9332\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
                        \ \u53C2\u7167: \u8A2D\u5B9A > \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF (\u7BA1\u7406\u8005\u6A29\u9650\u304C\u5FC5\u8981\u3067\u3059) share.manage = \u5171\u6709\u30E1\u30C7\u30A3\u30A2\u306E\u7BA1\u7406 diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties index be15ce25..b18de124 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties @@ -67,7 +67,7 @@ top.more = \uB354\uBCF4\uAE30 top.help = About top.search = \uAC80\uC0C9 top.upgrade = \uC54C\uB9BC! \uC0C8\uB85C\uC6B4 \uBC84\uC804\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
                        \uB2E4\uC6B4\uB85C\uB4DC {0} {1} \ - \uC5EC\uAE30. + \uC5EC\uAE30. top.missing = \uC9C0\uC815\uB41C \uC74C\uC545 \uC800\uC7A5\uC18C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \uC124\uC815\uC744 \uD655\uC778\uD574\uC8FC\uC138\uC694. top.logout = {0} \uB85C\uADF8\uC544\uC6C3 @@ -169,9 +169,9 @@ search.hits.songs = \uB178\uB798 gettingStarted.title = \uC2DC\uC791\uD558\uAE30 gettingStarted.text =

                        \uC11C\uBE0C\uC18C\uB2C9\uC5D0 \uC624\uC2E0 \uAC83\uC744 \uD658\uC601\uD569\uB2C8\uB2E4.! \uBA87\uAC00\uC9C0\uC758 \uAC04\uB2E8\uD55C \uB2E8\uACC4\uB9CC \uB530\uB77C\uD558\uC2DC\uBA74 \uC124\uC815\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
                        \ \uC774 \uD654\uBA74\uC744 \uBCF4\uACE0 \uC2F6\uC73C\uBA74 \uC5B8\uC81C\uB77C\uB3C4 \uC0C1\uB2E8\uC758 \uD648\uBC84\uD2BC\uC744 \uB20C\uB7EC\uC8FC\uC138\uC694..

                        \ -

                        \uC790\uC138\uD55C \uB0B4\uC6A9\uC740 \uB3C4\uC6C0\uB9D0\uC744 \uCC38\uC870\uD558\uC2DC\uAE30 \uBC14\uB78D\uB2C8\uB2E4.\uC2DC\uC791\uD558\uAE30

                        -gettingStarted.root = Warning! The Libresonic process is running as the root user. Please consider to \ - change this. +

                        \uC790\uC138\uD55C \uB0B4\uC6A9\uC740 \uB3C4\uC6C0\uB9D0\uC744 \uCC38\uC870\uD558\uC2DC\uAE30 \uBC14\uB78D\uB2C8\uB2E4.\uC2DC\uC791\uD558\uAE30

                        +gettingStarted.root = Warning! The Airsonic process is running as the root user. Please consider to \ + change this. gettingStarted.step1.title = \uAD00\uB9AC\uC790 \uC554\uD638 \uBCC0\uACBD\uD558\uAE30. gettingStarted.step1.text = \uAD00\uB9AC\uC790 \uC554\uD638\uB97C \uBCC0\uACBD\uD568\uC73C\uB85C\uC368 \uB2F9\uC2E0\uC758 \uC11C\uBC84\uB97C \uB354\uC6B1 \uC548\uC804\uD558\uAC8C \uB9CC\uB4E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \ \uC11C\uB85C \uB2E4\uB978 \uAD8C\uD55C\uC744 \uAC00\uC9C4 \uC0AC\uC6A9\uC790\uB97C \uB9CC\uB4E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. @@ -223,7 +223,7 @@ more.random.anyyear = \uBAA8\uB4E0 more.random.folder = \uC800\uC7A5\uC18C\uC5D0 more.random.anyfolder = \uBAA8\uB4E0 more.apps.title = \uC11C\uBE0C\uC18C\uB2C9 \uC571\uC2A4 -more.apps.text =

                        \uC11C\uBE0C\uC18C\uB2C9 \uC571\uC2A4 \uC544\uC774\uD3F0, \ +more.apps.text =

                        \uC11C\uBE0C\uC18C\uB2C9 \uC571\uC2A4 \uC544\uC774\uD3F0, \ \uC548\uB4DC\uB85C\uC774\uB4DC \uC640 AIR\uC5D0\uC11C \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.

                        more.minisub.title = \uBBF8\uB2C8\uC11C\uBE0C more.minisub.text =

                        \uBBF8\uB2C8\uC11C\uBC84 \uB294 \uC11C\uBE0C\uC18C\uB2C9\uC744 \uC704\uD55C HTML5 \uC18C\uD615 \uC7AC\uC0DD\uAE30\uC785\uB2C8\uB2E4. \ @@ -256,13 +256,13 @@ upload.unzipped = \uC555\uCD95\uC744 \uD480\uC5C8\uC2B5\uB2C8\uB2E4. {0} # help.jsp help.title = About {0} help.upgrade = \uC54C\uB9BC! \uC0C8\uB85C\uC6B4 \uBC84\uC804\uC774 \uB098\uC654\uC2B5\uB2C8\uB2E4. \uB2E4\uC6B4\uB85C\uB4DC {0} {1} \ - \uC5EC\uAE30. + \uC5EC\uAE30. help.version.title = \uBC84\uC804 help.builddate.title = \uBE4C\uB4DC \uB0A0\uC9DC help.server.title = \uC11C\uBC84 help.license.title = \uC774\uC6A9 \uC57D\uAD00 help.license.text = {0} is free software distributed under the GPL open-source license. \ - {0} uses licensed third-party libraries. Please note that {0} is not \ + {0} uses licensed third-party libraries. Please note that {0} is not \ a tool for illegal distribution of copyrighted material. Always pay attention to and follow the relevant laws specific to your country. help.homepage.title = \uD648\uD398\uC774\uC9C0 help.forum.title = \uD3EC\uB7FC @@ -271,7 +271,7 @@ help.contact.title = Contact help.contact.text = {0} is developed and maintained by Sindre Mehus \ (sindre@activeobjects.no). \ If you have any questions, comments or suggestions for improvements, please visit the \ - Libresonic Forum. + Airsonic Forum. help.log = \uB85C\uADF8 help.logfile = \uB85C\uADF8\uAC00 {0} \uC5D0 \uC815\uC0C1\uC801\uC73C\uB85C \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4. @@ -409,7 +409,7 @@ transcodingsettings.info =

                        (%s = \uBCC0\uD658\uD560 \uD30C\uC7 \uC5D4\uC9C4\uC740 \uC77C\uBC18\uC801\uC73C\uB85C \uC2A4\uD2B8\uB9AC\uBC0D\uC774 \uBD88\uAC00\uB2A5\uD55C \uBBF8\uB514\uC5B4\uB3C4 \uC2A4\uD2B8\uB9AC\uBC0D\uC774 \uAC00\uB2A5\uD558\uB3C4\uB85D \uD569\uB2C8\uB2E4. \uBCC0\uD658\uC740 \uBC14\uB85C \uC2E4\uD589\uB418\uBA70 \ \uCD94\uAC00\uC801\uC778 \uB514\uC2A4\uD06C \uACF5\uAC04\uC744 \uD544\uC694\uB85C \uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.

                        \

                        \uC2E4\uC81C \uBCC0\uD658\uC740 {0}\uC5D0 \uD0C0\uC0AC \uBA85\uB839\uC904 \uD504\uB85C\uADF8\uB7A8\uC774 \uC124\uCE58\uB418\uC5B4 \uC788\uC5B4\uC57C \uD569\uB2C8\uB2E4. \ - \uC708\uB3C4\uC6B0\uC6A9 \uBCC0\uD658 \uD328\uD0A4\uC9C0\uB294 \uC5EC\uAE30\uC5D0 \uC788\uC2B5\uB2C8\uB2E4. \ + \uC708\uB3C4\uC6B0\uC6A9 \uBCC0\uD658 \uD328\uD0A4\uC9C0\uB294 \uC5EC\uAE30\uC5D0 \uC788\uC2B5\uB2C8\uB2E4. \ \uC0AC\uC6A9\uC790 \uC815\uC758 \uBCC0\uD658 \uBC29\uBC95\uC740 \uC544\uB798\uC640 \uAC19\uC740 \uC0AC\uD56D\uC744 \uB9CC\uC871\uD574\uC57C \uD569\uB2C8\uB2E4. \

                          \
                        • \uBA85\uB839\uC904 \uC778\uD130\uD398\uC774\uC2A4\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4.
                          • \ @@ -477,7 +477,7 @@ playersettings.forget = \uC7AC\uC0DD\uAE30 \uC0AD\uC81C playersettings.clone = \uC7AC\uC0DD\uAE30 \uBCF5\uC81C dlnasettings.enabled = Enable DLNA server -dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Libresonic, \ +dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Airsonic, \ and stream your media to compatible DLNA players. @@ -613,7 +613,7 @@ share.facebook = \uD398\uC774\uC2A4\uBD81\uC5D0 \uACF5\uC720\uD558\uAE30 share.twitter = \uD2B8\uC704\uD130\uC5D0 \uACF5\uC720\uD558\uAE30 share.googleplus = \uAD6C\uAE00\uD50C\uB7EC\uC2A4\uC5D0 \uACF5\uC720\uD558\uAE30 share.link = \uC544\uB2C8\uBA74 \uADF8\uB4E4\uC5D0\uAC8C \uC774 \uB9C1\uD06C\uB97C \uBCF4\uB0B4\uC11C \uACF5\uC720\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. : {0} -share.disabled = \uBA3C\uC800 \uC790\uC2E0\uC758 libresonic.org \uC8FC\uC18C\uB97C \uB4F1\uB85D\uD574\uC57C \uB2E4\uB978 \uC0AC\uB78C\uACFC \uC74C\uC545\uC744 \uACF5\uC720 \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
                          \ +share.disabled = \uBA3C\uC800 \uC790\uC2E0\uC758 airsonic.org \uC8FC\uC18C\uB97C \uB4F1\uB85D\uD574\uC57C \uB2E4\uB978 \uC0AC\uB78C\uACFC \uC74C\uC545\uC744 \uACF5\uC720 \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
                          \ \uC124\uC815 > \uB124\uD2B8\uC6CC\uD06C \uB85C \uC774\uB3D9\uD558\uC2ED\uC2DC\uC624 (\uAD00\uB9AC\uC790 \uAD8C\uD55C\uC774 \uD544\uC694\uD569\uB2C8\uB2E4). share.manage = \uB0B4 \uACF5\uC720 \uBBF8\uB514\uC5B4 \uAD00\uB9AC diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties index 70c2efc3..efe05b5a 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties @@ -29,7 +29,7 @@ top.more = \u041F\u043E\u0432\u0435\u045C\u0435 top.help = \u041F\u043E\u043C\u043E\u0448 top.search = \u0411\u0430\u0440\u0430\u0458 top.upgrade = \u041D\u043E\u0432\u0430 \u0432\u0435\u0440\u0437\u0438\u0458\u0430 \u0435 \u0434\u043E\u0441\u0442\u0430\u043F\u043D\u0430. \u0421\u0438\u043C\u043D\u0438 \u0433\u043E {0} {1} \ - here. + here. top.missing = \u041D\u0435 \u0435 \u043F\u0440\u043E\u043D\u0430\u0458\u0434\u0435\u043D \u0444\u043E\u043B\u0434\u0435\u0440 \u0441\u043E \u043C\u0443\u0437\u0438\u043A\u0430. \u0412\u0435 \u043C\u043E\u043B\u0438\u043C\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0435\u0442\u0435 \u0433\u0438 \u043F\u043E\u0434\u0435\u0441\u0443\u0432\u0430\u045A\u0430\u0442\u0430. # left.jsp @@ -116,7 +116,7 @@ upload.unzipped = \u041E\u0442\u043F\u0430\u043A\u0443\u0432\u0430\u043D\u043E { # help.jsp help.title = \u0417\u0430 {0} help.upgrade = \u0411\u0435\u043B\u0435\u0448\u043A\u0430! \u041D\u043E\u0432\u0430 \u0432\u0435\u0440\u0437\u0438\u0458\u0430 \u0435 \u0434\u043E\u0441\u0442\u0430\u043F\u043D\u0430. \u0421\u0438\u043C\u043D\u0438 \u0433\u043E {0} {1} \ - here. + here. help.version.title = \u0412\u0435\u0440\u0437\u0438\u0458\u0430 help.builddate.title = \u0414\u0430\u0442\u0430 \u043D\u0430 \u0438\u0437\u0434\u0430\u0432\u0430\u045A\u0435 help.license.title = \u041B\u0438\u0446\u0435\u043D\u0446\u0430 @@ -127,7 +127,7 @@ help.contact.title = \u041A\u043E\u043D\u0442\u0430\u043A\u0442 help.contact.text = {0} \u0435 \u0438\u0437\u0440\u0430\u0431\u043E\u0442\u0435\u043D \u0438 \u0433\u043E \u043E\u0434\u0434\u0436\u0443\u0432\u0430 Sindre Mehus \ (sindre@activeobjects.no). \ \u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0431\u0438\u043B\u043E \u043A\u0430\u043A\u0432\u0438 \u043F\u0440\u0430\u0448\u0430\u045A\u0430, \u0437\u0430\u0431\u0435\u043B\u0435\u0448\u043A\u0438 \u0438\u043B\u0438 \u0441\u0443\u0433\u0435\u0441\u0442\u0438\u0438 \u0437\u0430 \u043F\u043E\u0434\u043E\u0431\u0440\u0443\u0432\u0430\u045A\u0430, \u0432\u0435 \u043C\u043E\u043B\u0438\u043C\u0435 \u043F\u043E\u0441\u0435\u0442\u0435\u0442\u0435 \u043D\u0435 \u043D\u0430 \ - Libresonic \u0424\u043E\u0440\u0443\u043C. + Airsonic \u0424\u043E\u0440\u0443\u043C. help.log = \u041B\u043E\u0433 # settingsHeader.jsp diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties index 4d4195e8..a5352a20 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties @@ -74,7 +74,7 @@ top.more = Meer top.help = Over top.search = Zoeken top.upgrade = Er is een nieuwe versie beschikbaar. Download {0} {1} \ - here. + here. top.missing = Geen mediamappen gevonden. Verander de Instellingen. top.logout = Uitloggen {0} @@ -172,16 +172,16 @@ search.hits.songs = Songs # gettingStarted.jsp gettingStarted.title = Snelgids -gettingStarted.text =

                          Welkom bij Libresonic!. De configuratie van Libresonic is eenvoudig, loop de volgende basisstappen even door.
                          \ +gettingStarted.text =

                          Welkom bij Airsonic!. De configuratie van Airsonic is eenvoudig, loop de volgende basisstappen even door.
                          \ Klik op de "Home" knop in de werkbalk hierboven om naar dit scherm terug te keren.

                          \ -

                          Raadpleeg de "Beginnersgids" voor meer informatie.

                          -gettingStarted.root = Let op! Het Libresonic proces werkt nu als de root gebruiker. Het wordt aanbevolen om\ - dit te veranderen. +

                          Raadpleeg de "Beginnersgids" voor meer informatie.

                          +gettingStarted.root = Let op! Het Airsonic proces werkt nu als de root gebruiker. Het wordt aanbevolen om\ + dit te veranderen. gettingStarted.step1.title = Verander administrator wachtwoord. gettingStarted.step1.text = Beveilig de server door het standaardwachtwoord van het administrator account te wijzigen. \ Tevens kun je hier nieuwe gebruikersaccounts met verschillende rechten aanmaken. gettingStarted.step2.title = Stel de mediamappen in. -gettingStarted.step2.text = Vertel Libresonic waar jouw muziek en videos staan. +gettingStarted.step2.text = Vertel Airsonic waar jouw muziek en videos staan. gettingStarted.step3.title = Configureer netwerk Instellingen. gettingStarted.hide = Dit niet meer laten zien. gettingStarted.hidealert = Ga naar instellingen > Algemeen, om dit scherm weer te tonen. @@ -230,8 +230,8 @@ more.random.year = en jaar more.random.anyyear = Elk more.random.folder = In map more.random.anyfolder = Elke -more.apps.title = Libresonic Apps -more.apps.text =

                          Bekijk de gestaag groeiende lijst van Libresonic apps. \ +more.apps.title = Airsonic Apps +more.apps.text =

                          Bekijk de gestaag groeiende lijst van Airsonic apps. \ Deze apps bieden alternatieven om te genieten van je media collectie - ongeacht waar je bent. \ Apps zijn beschikbaar voor Android, iPhone, Windows Phone, BlackBerry, Roku en veel meer.

                          more.mobile.title = Mobiele telefoon @@ -260,20 +260,20 @@ upload.unzipped = Uitgepakt {0} # help.jsp help.title = Over {0} help.upgrade = Let op! Er is een nieuwe versie beschikbaar. Download {0} {1} \ - hier. + hier. help.version.title = Versie help.builddate.title = Compileer datum help.server.title = Server help.license.title = Gebruiksvoorwaarden help.license.text = {0} is vrije software die wordt gedistribueerd onder de GPL open-source licentie. \ - {0} maakt gebruik van gelicenseerde bibliotheken van derden. {0} is geen \ + {0} maakt gebruik van gelicenseerde bibliotheken van derden. {0} is geen \ middel voor de illegale distributie van auteursrechtelijk beschermd materiaal. Hou rekening met de geldende wetten en bepalingen in jouw land! help.homepage.title = Website help.forum.title = Forum help.shop.title = Merchandise help.contact.title = Contact -help.contact.text = Libresonic is een gemeenschapsproject. Als je vragen, commentaar of suggesties hebt voor verbetering bezoek dan \ - #libresonic op Freenode of Libresonic op Reddit. +help.contact.text = Airsonic is een gemeenschapsproject. Als je vragen, commentaar of suggesties hebt voor verbetering bezoek dan \ + #airsonic op Freenode of Airsonic op Reddit. help.log = Log help.logfile = Het volledige logbestand is opgeslagen in {0}. @@ -394,7 +394,7 @@ musicfoldersettings.fastcache = Snelle toegangsmode. musicfoldersettings.fastcache.description = Gebruik deze optie om schijfgebruik te minimaliseren, bijvoorbeeld als de mediabestanden op een netwerkschijf staan. \ NB: Veranderingen aan bestanden worden alleen zichtbaar als de mediamappen zijn gescanned. (Zie hierboven). musicfoldersettings.expunge = Schoon database op -musicfoldersettings.expunge.description = Libresonic bewaart de informatie over alle mediabestanden die ooit zijn gevonden. Door de database op te schonen, wordt informatie \ +musicfoldersettings.expunge.description = Airsonic bewaart de informatie over alle mediabestanden die ooit zijn gevonden. Door de database op te schonen, wordt informatie \ over bestanden die niet langer bestaan definitief uit de database verwijderd. musicfoldersettings.organizebyfolderstructure = Organiseer via mappenstructuur. musicfoldersettings.organizebyfolderstructure.description = Gebruik deze optie om door jouw mediabibliotheek te bladeren via de mappenstructuur in plaats van artiest/album info in ID3 tags. @@ -464,8 +464,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Speel muziek direct af in de web browser met de ge\u00EFntegreerde Flash afspeler. playersettings.technology.external.text = Speel muziek met je favoriete afspeler, zoals WinAmp of Windows Media Player. playersettings.technology.external_with_playlist.text = Hetzelfde als hierboven, maar de speellijst wordt beheerd door de afspeler, en niet \ - door de Libresonic server. In deze mode, is overslaan van liedjes mogelijk. -playersettings.technology.jukebox.text = Speel muziek direct af via de geluidskaart van de Libresonic server. (Alleen voor geauthoriseerde gebruikers). + door de Airsonic server. In deze mode, is overslaan van liedjes mogelijk. +playersettings.technology.jukebox.text = Speel muziek direct af via de geluidskaart van de Airsonic server. (Alleen voor geauthoriseerde gebruikers). playersettings.name = Afspeler naam playersettings.coverartsize = Grootte albumhoes playersettings.maxbitrate = Max bitsnelheid @@ -482,7 +482,7 @@ playersettings.forget = Verwijder afspeler playersettings.clone = Kloon afspeler dlnasettings.enabled = Activeer DLNA server -dlnasettings.description = Gebruik deze optie om jouw media collectie beschikbaar te maken via de DLNA/UPnP Media Server in Libresonic. \ +dlnasettings.description = Gebruik deze optie om jouw media collectie beschikbaar te maken via de DLNA/UPnP Media Server in Airsonic. \ Let op: Deze functie is experimenteel en werkt wellicht niet met alle DLNA clients. # shareSettings.jsp @@ -613,7 +613,7 @@ share.facebook = Deel op Facebook share.twitter = Deel op Twitter share.googleplus = Deel op Google+ share.link = of deel dit door iemand de volgende link te sturen: {0} -share.disabled = Om jouw muziek te kunnen delen moet je eerst je eigen libresonic.org adres registreren.
                          \ +share.disabled = Om jouw muziek te kunnen delen moet je eerst je eigen airsonic.org adres registreren.
                          \ Ga naar Instellingen > Netwerk (Administrator rechten vereist!). share.manage = Beheer gedeelde media. @@ -654,7 +654,7 @@ helppopup.transcode.text =

                          Als je een beperkte bandbreedte hebt kun je hier e Voorbeeld: Als jouw originele mp3-bestanden een bitrate hebben van 256 Kbps (kilobits per second), zal {0} bij een \ ingestelde max bitrate van 128 automatisch de muziek resamplen van 256 to naar 128 Kbps.

                          \ helppopup.playlistfolder.title = Importeer speellijsten van -helppopup.playlistfolder.text =

                          Libresonic zal regelmatig de afspeelijsten in deze map importeren.

                          +helppopup.playlistfolder.text =

                          Airsonic zal regelmatig de afspeelijsten in deze map importeren.

                          helppopup.musicmask.title = Muziekbestanden helppopup.musicmask.text =

                          Geef hier aan welke bestandstypen als muziekbestanden moeten worden gezien.

                          helppopup.videomask.title = Videobestanden diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties index 1163cc55..76acef84 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties @@ -46,7 +46,7 @@ top.more = Meir top.help = Om top.search = S\u00F8k top.upgrade = Det finst ei oppdatert utg\u00E5ve. Last ned {0} {1} \ - her. + her. top.missing = Fann ingen musikk-mapper. Endra innstillingane. top.logout = Logg ut {0} @@ -166,7 +166,7 @@ upload.unzipped = Pakka ut {0} # help.jsp help.title = Om {0} help.upgrade = NB! Det finst ei oppdatert utg\u00E5ve. Last ned {0} {1} \ - her. + her. help.version.title = Versjon help.builddate.title = Byggedato help.server.title = Tenar @@ -178,7 +178,7 @@ help.shop.title = Butikk help.contact.title = Kontakt help.contact.text = {0} er utvikla og vedlikehalde av Sindre Mehus \ (sindre@activeobjects.no). \ - G\u00E5 til Libresonic-forumet viss du har sp\u00F8rsm\u00E5l, \ + G\u00E5 til Airsonic-forumet viss du har sp\u00F8rsm\u00E5l, \ kommentarar eller forslag til forbetringar. help.log = Logg help.logfile = Heile loggen finst i {0}. @@ -295,7 +295,7 @@ transcodingsettings.info =

                          (%s = fila som skal konverterast, % Konverteringa skjer p\u00E5 direkten etter behov, og krev ikkje bruk av disk.

                          \

                          Den faktiske konverteringa vert utf\u00F8rt av kommandolinja til tredjepart-program som m\u00E5 installerast i {0}. \ Ei samling av konverterarar for Windows \ - kan du lasta ned her. Du kan leggja til ein eigen \ + kan du lasta ned her. Du kan leggja til ein eigen \ konverterar viss han tilfredsstiller f\u00F8lgjande krav: \

                            \
                          • Han m\u00E5 ha eit kommandolinje-grensesnitt.
                            • \ @@ -345,8 +345,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Spel musikk direkte i nettlesaren ved \u00E5 bruka den integrerte Flash-spelaren. playersettings.technology.external.text = Spel musikk i din favorittmediaspelar, som WinAmp eller Windows Media Player. playersettings.technology.external_with_playlist.text = Same som over, men la spelelista kontrollerast av spelaren i staden for \ - Libresonic-tenaren. I denne modusen er det mogleg \u00E5 spola innanfor songar. -playersettings.technology.jukebox.text = Spel musikk direkte gjennom lydsystemet til Libresonic-tenaren. (Berre autoriserte brukarar) + Airsonic-tenaren. I denne modusen er det mogleg \u00E5 spola innanfor songar. +playersettings.technology.jukebox.text = Spel musikk direkte gjennom lydsystemet til Airsonic-tenaren. (Berre autoriserte brukarar) playersettings.name = Namn p\u00E5 spelar playersettings.coverartsize = Biletstorleik playersettings.maxbitrate = Maksimal bandbreidd diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties index 28903c62..8704fa62 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties @@ -46,7 +46,7 @@ top.more = Mer top.help = Om top.search = S\u00F8k top.upgrade = Det finnes en oppdatert versjon. Last ned {0} {1} \ - her. + her. top.missing = Fant ingen musikk-mapper. Endre innstillingene. top.logout = Logg ut {0} @@ -166,7 +166,7 @@ upload.unzipped = Pakket ut {0} # help.jsp help.title = Om {0} help.upgrade = NB! Det finnes en oppdatert versjon. Last ned {0} {1} \ - her. + her. help.version.title = Versjon help.builddate.title = Byggedato help.server.title = Server @@ -178,7 +178,7 @@ help.shop.title = Butikk help.contact.title = Kontakt help.contact.text = {0} er utviklet og vedlikeholdt av Sindre Mehus \ (sindre@activeobjects.no). \ - Bes\u00F8k Libresonic Forum hvis du har sp\u00F8rsm\u00E5l, \ + Bes\u00F8k Airsonic Forum hvis du har sp\u00F8rsm\u00E5l, \ kommentarer eller forslag til forbedringer. help.log = Logg help.logfile = Hele loggen finnes i {0}. @@ -295,7 +295,7 @@ transcodingsettings.info =

                            (%s = Fila som skal konverteres, %b Konverteringen skjer p\u00E5 direkten etter behov, og krever ikke bruk av disk.

                            \

                            Den faktiske konverteringen utf\u00F8res av tredjeparts kommandolinje-program som m\u00E5 installeres i {0}. \ En samling av konvertere for Windows \ - kan lastes ned her. Du kan legge til en egen \ + kan lastes ned her. Du kan legge til en egen \ konverterer hvis den tilfredsstiller f\u00F8lgende krav: \

                              \
                            • Den m\u00E5 ha et kommandolinje-grensesnitt.
                              • \ @@ -345,8 +345,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Spill musikk direkte i nettleseren ved \u00E5 bruke den integrerte Flash-spilleren. playersettings.technology.external.text = Spill musikk i din favorittmediaspiller, som WinAmp eller Windows Media Player. playersettings.technology.external_with_playlist.text = Samme som over, men la spillek\u00F8en bli kontrollert av spilleren istedenfor \ - Libresonic-serveren. I denne modusen er det mulig \u00E5 spole innenfor sanger. -playersettings.technology.jukebox.text = Spill musikk direkte gjennom lydsystemet til Libresonic-serveren. (Kun autoriserte brukere) + Airsonic-serveren. I denne modusen er det mulig \u00E5 spole innenfor sanger. +playersettings.technology.jukebox.text = Spill musikk direkte gjennom lydsystemet til Airsonic-serveren. (Kun autoriserte brukere) playersettings.name = Navn p\u00E5 spiller playersettings.coverartsize = Bildest\u00F8rrelse playersettings.maxbitrate = Maksimal b\u00E5ndbredde diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties index ac76260d..95531f6d 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties @@ -46,7 +46,7 @@ top.more = Wi\u0119cej top.help = Pomoc top.search = Szukaj top.upgrade = Dost\u0119pna jest nowa wersja. Pobierz {0} {1} \ - tutaj. + tutaj. top.missing = Brak folder\u00F3w medi\u00F3w. Prosz\u0119 zmieni\u0107 ustawienia. top.logout = Wyloguj {0} @@ -114,9 +114,9 @@ search.hits.songs = Utwory # gettingStarted.jsp gettingStarted.title = Pierwsze kroki -gettingStarted.text =

                              Witamy w Libresonic! Konfiguracja zajmie tylko chwil\u0119, wystarczy wykona\u0107 poni\u017Csze czynno\u015Bci.
                              \ +gettingStarted.text =

                              Witamy w Airsonic! Konfiguracja zajmie tylko chwil\u0119, wystarczy wykona\u0107 poni\u017Csze czynno\u015Bci.
                              \ Kliknij przycisk "G\u0142\u00F3wna" na pasku narz\u0119dzi powy\u017Cej, aby wr\u00F3ci\u0107 do tego ekranu.

                              \ -

                              Wi\u0119cej informacji mo\u017Cna znale\u017A\u0107 w Instrukcji Obs\u0142ugi.

                              +

                              Wi\u0119cej informacji mo\u017Cna znale\u017A\u0107 w Instrukcji Obs\u0142ugi.

                              gettingStarted.step1.title = Zmie\u0144 has\u0142o administratora. gettingStarted.step1.text = Zabezpiecz sw\u00F3j serwer zmieniaj\u0105c domyslne has\u0142o administratora. \ Mo\u017Cesz tak\u017Ce stworzy\u0107 nowe konta u\u017Cytkownik\u00F3w oraz okre\u015Bli\u0107 uprawnienia. @@ -162,8 +162,8 @@ more.random.year = z roku more.random.anyyear = Dowolny more.random.folder = w folderze more.random.anyfolder = Dowolny -more.apps.title = Libresonic Apps -more.apps.text =

                              Aplikacje Libresonic s\u0105 dost\u0119pna dla systemu Android, iPhone, \ +more.apps.title = Airsonic Apps +more.apps.text =

                              Aplikacje Airsonic s\u0105 dost\u0119pna dla systemu Android, iPhone, \ Windows Phone oraz AIR.

                              more.mobile.title = Telefon kom\u00F3rkowy more.mobile.text =

                              Mo\u017Cesz kontrolowa\u0107 {0} przy pomocy dowolnego telefonu lub PDA wyposa\u017Conego w WAP.
                              \ @@ -191,13 +191,13 @@ upload.unzipped = Rozpakowano {0} # help.jsp help.title = O {0} help.upgrade = Uwaga! Dost\u0119pna jest nowa wersja. Pobierz {0} {1} \ - tutaj. + tutaj. help.version.title = Wersja help.builddate.title = Data wydania help.server.title = Serwer help.license.title = Licencja help.license.text = {0} jest darmowym oprogramowaniem rozpowszechnianym na licencji typu open-source - GPL. \ - {0} wykorzystuje licencjonowane biblioteki zewn\u0119trznych dostawc\u00F3w. + {0} wykorzystuje licencjonowane biblioteki zewn\u0119trznych dostawc\u00F3w. help.homepage.title = Strona domowa help.forum.title = Forum @@ -206,7 +206,7 @@ help.contact.title = Kontakt help.contact.text = {0} jest rozwijany i utrzymywany przez Sindre Mehus \ (sindre@activeobjects.no). \ Je\u015Bli masz pytania, uwagi lub sugestie, zapraszam na \ - forum Libresonic. + forum Airsonic. help.log = Log help.logfile = Pe\u0142ny log mo\u017Cna odnale\u017A\u0107 w {0}. @@ -325,7 +325,7 @@ transcodingsettings.info =

                              (%s = Plik kt\u00F3ry b\u0119dzie t dodatkowej przestrzeni dyskowej.

                              \

                              Obecnie transkodowanie realizowane jest z wykorzystaniem program\u00F3w lini polece\u0144 dostawc\u00F3w zewn\u0119trznych. Programy te musz\u0105 by\u0107 zainstalowane w {0}. \ Pakiet transkoder\u00F3w dla Windows \ - jest dost\u0119pny tutaj. Mo\u017Cesz tak\u017Ce doda\u0107 w\u0142asny transkoder, pod warunkiem i\u017C \ + jest dost\u0119pny tutaj. Mo\u017Cesz tak\u017Ce doda\u0107 w\u0142asny transkoder, pod warunkiem i\u017C \ spe\u0142nia on warunki: \

                                \
                              • Posiada interfejs lini polece\u0144
                                • \ @@ -375,8 +375,8 @@ playersettings.technology.jukebox.title = Szafa graj\u0105ca playersettings.technology.web.text = Odtwarzaj muzyk\u0119 bezpo\u015Brednio w przegl\u0105darce za pomoc\u0105 odtwarzacza Flash. playersettings.technology.external.text = Odtwarzaj muzyk\u0119 w ulubionym programie, takim jak WinAmp czy Windows Media Player. playersettings.technology.external_with_playlist.text = Podobnie jak wy\u017Cej, jednak playlista zarz\u0105dzana jest przez odtwarzacz \ - a nie serwer Libresonic. W tym trybie mo\u017Cliwe jest pomijanie utwor\u00F3w. -playersettings.technology.jukebox.text = Odtwarzaj muzyk\u0119 bezpo\u015Brednio na urz\u0105dzeniu audio serwera gdzie zainstalowany jest Libresonic. (jedynie zarejestowanie u\u017Cytkownicy). + a nie serwer Airsonic. W tym trybie mo\u017Cliwe jest pomijanie utwor\u00F3w. +playersettings.technology.jukebox.text = Odtwarzaj muzyk\u0119 bezpo\u015Brednio na urz\u0105dzeniu audio serwera gdzie zainstalowany jest Airsonic. (jedynie zarejestowanie u\u017Cytkownicy). playersettings.name = Nazwa odtwarzacza playersettings.coverartsize = Rozmiar ok\u0142adek playersettings.maxbitrate = Maksymalny bitrate @@ -512,7 +512,7 @@ share.warning =

                                WA\u017BNA UWAGA!

                                Graj fair - Nie udost\u0119pniaj ma share.facebook = Udost\u0119pnij na Facebooku share.twitter = Udost\u0119pnij na Twitterze share.link = Lub Udost\u0119pnij komu\u015B, wysy\u0142aj\u0105c link: {0} -share.disabled = Aby wsp\u00F3\u0142dzieli\u0107 muzyke z innymi u\u017Cytkownikami, musisz najpierw zarejestrowa\u0107 sw\u00F3j adres libresonic.org.
                                \ +share.disabled = Aby wsp\u00F3\u0142dzieli\u0107 muzyke z innymi u\u017Cytkownikami, musisz najpierw zarejestrowa\u0107 sw\u00F3j adres airsonic.org.
                                \ Przejd\u017A do Ustawienia > Sie\u0107 (administrative rights required). share.manage = Zarz\u0105dzaj udost\u0119pnionymi pliki diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties index a956b80c..e5e2492a 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties @@ -45,7 +45,7 @@ top.more = Mais top.help = Acerca top.search = Pesquisar top.upgrade = Uma nova vers\u00E3o est\u00E1 dispon\u00EDvel. Descarregar {0} {1} \ - aqui. + aqui. top.missing = N\u00E3o se encontra nenhuma pasta. Por favor mude as configura\u00E7\u00F5es. top.logout = Terminar sess\u00E3o {0} @@ -109,14 +109,14 @@ search.hits.songs = M\u00FAsicas # gettingStarted.jsp gettingStarted.title = Primeiros passos -gettingStarted.text =

                                Bem-vindo ao Libresonic! Vamos prepar\u00E1-lo num instante, basta seguir os seguintes passos b\u00E1sicos.
                                \ +gettingStarted.text =

                                Bem-vindo ao Airsonic! Vamos prepar\u00E1-lo num instante, basta seguir os seguintes passos b\u00E1sicos.
                                \ Clicar no bot\u00E3o "In\u00EDcio" na barra acima para voltar a este ecran.

                                \ -

                                Para mais informa\u00E7\u00F5es, por favor consulte oGuia Primeiros passos.

                                +

                                Para mais informa\u00E7\u00F5es, por favor consulte oGuia Primeiros passos.

                                gettingStarted.step1.title = Mudar senha do administrador. gettingStarted.step1.text = Proteja o seu servidor, alterando a senha padr\u00E3o para a conta de administrador. \ Pode criar novas contas de utilizador com privil\u00E9gios diferentes. gettingStarted.step2.title = Criar pastas de m\u00FAsica. -gettingStarted.step2.text = Mostrar ao Libresonic onde tem a sua m\u00FAsica. +gettingStarted.step2.text = Mostrar ao Airsonic onde tem a sua m\u00FAsica. gettingStarted.step3.title = Configura\u00E7\u00F5es de rede. gettingStarted.hide = N\u00E3o mostrar mais gettingStarted.hidealert = Para mostar este ecran outra vez, v\u00E1 a Configura\u00E7\u00F5es > Geral. @@ -157,8 +157,8 @@ more.random.year = e ano more.random.anyyear = Qualquer more.random.folder = na pasta more.random.anyfolder = Qualquer -more.apps.title = Aplica\u00E7\u00F5es Libresonic -more.apps.text =

                                Aplica\u00E7\u00F5es Libresonic est\u00E3o dispon\u00EDveis para iPhone, \ +more.apps.title = Aplica\u00E7\u00F5es Airsonic +more.apps.text =

                                Aplica\u00E7\u00F5es Airsonic est\u00E3o dispon\u00EDveis para iPhone, \ Android e AIR.

                                more.mobile.title = Telem\u00F3vel more.mobile.text =

                                Pode controlar o {0} com qualquer telem\u00F3vel que tenha WAP activado ou num PDA.
                                \ @@ -187,13 +187,13 @@ upload.unzipped = Descomprimido {0} # help.jsp help.title = Acerca {0} help.upgrade = Aviso! Est\u00E1 dispon\u00EDvel uma nova vers\u00E3o. Descarregar {0} {1} \ - aqui. + aqui. help.version.title = Vers\u00E3o help.builddate.title = Data de compila\u00E7\u00E3o help.server.title = Servidor help.license.title = Licen\u00E7a help.license.text = O {0} \u00E9 um software livre distribuido sobre a licen\u00E7a GPL de c\u00F3digo aberto. \ - O {0} usa uma licen\u00E7a de bibliotecas de terceiros. Tome nota que o {0} n\u00E3o \u00E9 \ + O {0} usa uma licen\u00E7a de bibliotecas de terceiros. Tome nota que o {0} n\u00E3o \u00E9 \ uma ferramenta para a distribui\u00E7\u00E3o ilegal de material protegido por direitos de autor. Preste sempre aten\u00E7\u00E3o e siga as leis espec\u00EDficas para o seu pa\u00EDs. help.homepage.title = P\u00E1gina do projecto help.forum.title = Forum @@ -202,7 +202,7 @@ help.contact.title = Contacto help.contact.text = O {0} \u00E9 desenvolvido e mantido por Sindre Mehus \ (sindre@activeobjects.no). \ Se tiver quaisquer perguntas, coment\u00E1rios ou sugest\u00F5es para melhorias, por favor visite o Forum do\ - Libresonic . + Airsonic . help.log = Log help.logfile = O log completo est\u00E1 guardado em {0}. @@ -319,7 +319,7 @@ transcodingsettings.info =

                                (%s = O ficheiro a ser transcodific requer o uso do disco.

                                \

                                A transcodifica\u00E7\u00E3o \u00E9 feita por programas de terceiros que devem ser instalados em {0}. \ Um pacote de transcodifica\u00E7\u00E3o para o Windows \ - est\u00E1 dispon\u00EDvel aqui. Pode adicionar o seu pr\u00F3prio transcodificador, desde que \ + est\u00E1 dispon\u00EDvel aqui. Pode adicionar o seu pr\u00F3prio transcodificador, desde que \ preencha os seguintes requisitos: \

                                  \
                                • Deve ter uma interface de linha de comando.
                                  • \ @@ -369,8 +369,8 @@ playersettings.technology.jukebox.title = Caixa de M\u00FAsica playersettings.technology.web.text = Reproduzir m\u00FAsica directamente no navegador web usando o Flash player integrado. playersettings.technology.external.text = Reproduzir m\u00FAsica no seu Leitor favorito, como o Winamp ou o Windows Media Player. playersettings.technology.external_with_playlist.text = O mesmo que acima, mas a lista \u00E9 gerida pelo Leitor, em vez \ - do servidor Libresonic. Neste modo, o avan\u00E7o nas m\u00FAsicas \u00E9 poss\u00EDvel. -playersettings.technology.jukebox.text = Reproduzir m\u00FAsicas directamente no dispositivo de \u00E1udio do servidor Libresonic. (S\u00F3 utilizadores autorizados). + do servidor Airsonic. Neste modo, o avan\u00E7o nas m\u00FAsicas \u00E9 poss\u00EDvel. +playersettings.technology.jukebox.text = Reproduzir m\u00FAsicas directamente no dispositivo de \u00E1udio do servidor Airsonic. (S\u00F3 utilizadores autorizados). playersettings.name = Nome do Leitor playersettings.coverartsize = Tamanho de capa playersettings.maxbitrate = Max bitrate diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties index ac1568c7..197a5df0 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties @@ -45,7 +45,7 @@ top.more = \u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u0 top.help = \u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435 top.search = \u041F\u043E\u0438\u0441\u043A top.upgrade = \u041D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u0421\u043A\u0430\u0447\u0430\u0442\u044C {0} {1} \ - \u0442\u0443\u0442. + \u0442\u0443\u0442. top.missing = \u041D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E \u043F\u0430\u043F\u043E\u043A \u0441 \u043C\u0443\u0437\u044B\u043A\u043E\u0439. \u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438. top.logout = \u0412\u044B\u0439\u0442\u0438 {0} @@ -104,13 +104,13 @@ search.hits.none = \u0421\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0439 # gettingStarted.jsp gettingStarted.title = \u041E\u0437\u043D\u0430\u043A\u043E\u043C\u043B\u0435\u043D\u0438\u0435 -gettingStarted.text =

                                  \u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C \u0432 Libresonic! \u041C\u044B \u043F\u043E\u043C\u043E\u0436\u0435\u043C \u0432\u0430\u043C \u043D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0441\u0438\u0441\u0442\u0435\u043C\u0443 \u0437\u0430 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u043E\u0441\u0442\u044B\u0445 \u0448\u0430\u0433\u043E\u0432.
                                  \ +gettingStarted.text =

                                  \u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C \u0432 Airsonic! \u041C\u044B \u043F\u043E\u043C\u043E\u0436\u0435\u043C \u0432\u0430\u043C \u043D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0441\u0438\u0441\u0442\u0435\u043C\u0443 \u0437\u0430 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u043E\u0441\u0442\u044B\u0445 \u0448\u0430\u0433\u043E\u0432.
                                  \ \u041D\u0430\u0436\u043C\u0438\u0442\u0435 \u043A\u043D\u043E\u043F\u043A\u0443 "\u0413\u043B\u0430\u0432\u043D\u0430\u044F" \u043D\u0430 \u043F\u0430\u043D\u0435\u043B\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432, \u0447\u0442\u043E \u0431\u044B \u0432\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u0441\u044E\u0434\u0430.

                                  gettingStarted.step1.title = \u0421\u043C\u0435\u043D\u0430 \u043F\u0430\u0440\u043E\u043B\u044F \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0430. gettingStarted.step1.text = \u0417\u0430\u0449\u0438\u0442\u0438\u0442\u0435 \u0432\u0430\u0448 \u0441\u0435\u0440\u0432\u0435\u0440, \u0441\u043C\u0435\u043D\u0438\u0432 \u043F\u0430\u0440\u043E\u043B\u044C \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0430. \ \u0422\u0430\u043A \u0436\u0435 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0441\u043E\u0437\u0434\u0430\u0432\u0430\u0442\u044C \u0434\u0440\u0443\u0433\u0438\u0435 \u0430\u043A\u0430\u0443\u043D\u0442\u044B \u0441 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u044B\u043C\u0438 \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u044F\u043C\u0438. gettingStarted.step2.title = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u043F\u0430\u043F\u043E\u043A \u0441 \u043C\u0443\u0437\u044B\u043A\u043E\u0439. -gettingStarted.step2.text = \u041F\u043E\u043A\u0430\u0436\u0438\u0442\u0435 Libresonic \u0433\u0434\u0435 \u0432\u044B \u0445\u0440\u0430\u043D\u0438\u0442\u0435 \u043C\u0443\u0437\u044B\u043A\u0443. +gettingStarted.step2.text = \u041F\u043E\u043A\u0430\u0436\u0438\u0442\u0435 Airsonic \u0433\u0434\u0435 \u0432\u044B \u0445\u0440\u0430\u043D\u0438\u0442\u0435 \u043C\u0443\u0437\u044B\u043A\u0443. gettingStarted.step3.title = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0441\u0435\u0442\u0438. gettingStarted.hide = \u041D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u044D\u0442\u043E \u0431\u043E\u043B\u044C\u0448\u0435 gettingStarted.hidealert = \u0427\u0442\u043E \u0431\u044B \u043E\u043F\u044F\u0442\u044C \u0443\u0432\u0438\u0434\u0435\u0442\u044C \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0437\u0430\u0439\u0434\u0438\u0442\u0435 \u0432 \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 - \u041E\u0441\u043D\u043E\u0432\u043D\u044B\u0435. @@ -177,13 +177,13 @@ upload.unzipped = \u0420\u0430\u0441\u043F\u0430\u043A\u043E\u0432\u0430\u043D\u # help.jsp help.title = \u041E {0} help.upgrade = \u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435! \u041D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430. \u0421\u043A\u0430\u0447\u0430\u0442\u044C {0} {1} \ - \u0442\u0443\u0442. + \u0442\u0443\u0442. help.version.title = \u0412\u0435\u0440\u0441\u0438\u044F help.builddate.title = \u0414\u0430\u0442\u0430 \u0431\u0438\u043B\u0434\u0430 help.server.title = \u0421\u0435\u0440\u0432\u0435\u0440 help.license.title = \u041B\u0438\u0446\u0435\u043D\u0437\u0438\u044F help.license.text = {0} \u0431\u0435\u0441\u043F\u043B\u0430\u0442\u043D\u0430\u044F \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0440\u0430\u0441\u043F\u043E\u0441\u0442\u0440\u0430\u043D\u044F\u0435\u043C\u0430\u044F \u043F\u043E GPL. \ - {0} \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 \u043B\u0438\u0446\u0435\u043D\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0442\u0440\u0435\u0442\u044C\u0438\u0445 \u0441\u0442\u043E\u0440\u043E\u043D. + {0} \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 \u043B\u0438\u0446\u0435\u043D\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u0442\u0440\u0435\u0442\u044C\u0438\u0445 \u0441\u0442\u043E\u0440\u043E\u043D. help.homepage.title = \u0413\u043B\u0430\u0432\u043D\u0430\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 help.forum.title = \u0424\u043E\u0440\u0443\u043C help.shop.title = Merchandise @@ -191,7 +191,7 @@ help.contact.title = \u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B help.contact.text = {0} \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u0430 Sindre Mehus \ (sindre@activeobjects.no). \ \u043F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u0438 \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u044F\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0442\u044C\u0441\u044F \u043D\u0430 \ - Libresonic \u0424\u043E\u0440\u0443\u043C. + Airsonic \u0424\u043E\u0440\u0443\u043C. help.log = \u041B\u043E\u0433 help.logfile = \u041F\u043E\u043B\u043D\u044B\u0439 \u043B\u043E\u0433 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D \u0432 {0}. @@ -307,7 +307,7 @@ transcodingsettings.info =

                                  (%s = \u0424\u0430\u0439\u043B, \u0 \u0438 \u043D\u0435 \u0442\u0440\u0435\u0431\u0443\u0435\u0442 \u0434\u0438\u0441\u043A\u043E\u0432\u043E\u0433\u043E \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u0430.

                                  \

                                  \u0424\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430 \u043E\u0431\u0435\u0441\u043F\u0435\u0447\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u0443\u0436\u0435 \u0433\u043E\u0442\u043E\u0432\u044B\u043C\u0438 \u043A\u043E\u043D\u0441\u043E\u043B\u044C\u043D\u044B\u043C\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\u043C\u0438 \u0442\u0440\u0435\u0442\u044C\u0438\u0445 \u0441\u0442\u043E\u0440\u043E\u043D, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044B \u0432 {0}. \ \u041F\u0430\u043A\u0435\u0442 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0438 \u043F\u043E\u0434 Windows \ - \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0437\u0434\u0435\u0441\u044C. \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0439 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0449\u0438\u043A, \ + \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0437\u0434\u0435\u0441\u044C. \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0439 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0449\u0438\u043A, \ \u043D\u043E \u043E\u043D \u0434\u043E\u043B\u0436\u0435\u043D \u0443\u0434\u043E\u0432\u043B\u0435\u0442\u0432\u043E\u0440\u044F\u0442\u044C \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C \u0443\u0441\u043B\u043E\u0432\u0438\u044F\u043C: \

                                    \
                                  • \u0418\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C \u043A\u043E\u043D\u0441\u043E\u043B\u044C\u043D\u044B\u043C.
                                    • \ @@ -357,8 +357,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = \u0412\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442 \u043C\u0443\u0437\u044B\u043A\u0430\u043B\u044C\u043D\u044B\u0435 \u0444\u0430\u0439\u043B\u044B \u0432 \u0438\u043D\u0442\u0435\u0433\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u043C flash-\u043F\u0440\u043E\u0438\u0433\u0440\u044B\u0432\u0430\u0442\u0435\u043B\u0435. playersettings.technology.external.text = \u0412\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442 \u043C\u0443\u0437\u044B\u043A\u0443 \u0432 \u0432\u0430\u0448\u0435\u043C \u043B\u044E\u0431\u0438\u043C\u043E\u043C \u043F\u0440\u043E\u0438\u0433\u0440\u044B\u0432\u0430\u0442\u0435\u043B\u0435, \u0442\u0430\u043A\u043E\u043C \u043A\u0430\u043A WinAmp \u0438\u043B\u0438 Windows Media Player. playersettings.technology.external_with_playlist.text =\u041A\u0430\u043A \u0438 \u043F\u0440\u0435\u0434\u0438\u0434\u0443\u0449\u0438\u0439, \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u043E\u0438\u0433\u0440\u044B\u0432\u0430\u0442\u0435\u043B\u044C \u0438\u043C\u0435\u0435\u0442 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \ - \u043F\u043B\u0435\u0439\u043B\u0438\u0441\u0442\u044B \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 Libresonic. \u0412 \u044D\u0442\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u044B \u043F\u0440\u043E\u043F\u0443\u0441\u043A\u0438 \u0442\u0440\u0435\u043A\u043E\u0432. -playersettings.technology.jukebox.text = \u0412\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435 \u043C\u0443\u0437\u044B\u043A\u0443 \u043D\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435, \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u043E\u043C \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 Libresonic. (\u0422\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0445 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439). + \u043F\u043B\u0435\u0439\u043B\u0438\u0441\u0442\u044B \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 Airsonic. \u0412 \u044D\u0442\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u044B \u043F\u0440\u043E\u043F\u0443\u0441\u043A\u0438 \u0442\u0440\u0435\u043A\u043E\u0432. +playersettings.technology.jukebox.text = \u0412\u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435 \u043C\u0443\u0437\u044B\u043A\u0443 \u043D\u0430 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435, \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u043E\u043C \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 Airsonic. (\u0422\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0445 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439). playersettings.name = \u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u043F\u043B\u0435\u0435\u0440\u0430 playersettings.coverartsize = \u0420\u0430\u0437\u043C\u0435\u0440 \u043E\u0431\u043B\u043E\u0436\u043A\u0438 playersettings.maxbitrate = \u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0431\u0438\u0442\u0440\u044D\u0439\u0442 diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties index a9085fed..60eecc70 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties @@ -65,10 +65,10 @@ top.settings = Nastavitve top.status = Stanje top.podcast = Podcast top.more = Dodatno -top.help = O Libresonicu +top.help = O Airsonicu top.search = Iskanje top.upgrade = Na voljo je nova razli\u010Dica. Prenesite {0} {1} \ - tukaj. + tukaj. top.missing = Ne najdem imenikov z glasbo. Prosimo, popravite nastavitve. top.logout = Odjava: {0} @@ -160,16 +160,16 @@ search.hits.songs = Skladbe # gettingStarted.jsp gettingStarted.title = Uvod -gettingStarted.text =

                                    Dobrodo\u0161li v Libresonicu! Namestitev bo hitra, le spodnjim korakom morate slediti.
                                    \ +gettingStarted.text =

                                    Dobrodo\u0161li v Airsonicu! Namestitev bo hitra, le spodnjim korakom morate slediti.
                                    \ Kliknite gumb "Domov" v orodni vrstici za vrnitev v to okno.

                                    \ -

                                    Za ve\u010D informacij si poglejte Uvod.

                                    -gettingStarted.root = Pozor! Program Libresonic se izvaja kot root uporabnik. Prosimo premislite, \u010De \u017Eelite \ - to spremeniti. +

                                    Za ve\u010D informacij si poglejte Uvod.

                                    +gettingStarted.root = Pozor! Program Airsonic se izvaja kot root uporabnik. Prosimo premislite, \u010De \u017Eelite \ + to spremeniti. gettingStarted.step1.title = Sprememba administratorskega gesla. gettingStarted.step1.text = Zavarujte va\u0161 stre\u017Enik tako, da spremenite privzeto administratorsko geslo. \ Ustvarite lahko tudi nove uporabni\u0161ke ra\u010Dune z razli\u010Dnimi pravicami. gettingStarted.step2.title = Dolo\u010Dite imenike z glasbo. -gettingStarted.step2.text = Povejte Libresonicu, kje hranite va\u0161e glasbene datoteke. +gettingStarted.step2.text = Povejte Airsonicu, kje hranite va\u0161e glasbene datoteke. gettingStarted.step3.title = Nastavi omre\u017Ene nastavitve. gettingStarted.hide = Ne prikazuj ve\u010D teh navodil. gettingStarted.hidealert = \u010Ce \u017Eelite ponovno prebrati ta navodila, poglejte v Nastavitve > Splo\u0161no. @@ -214,8 +214,8 @@ more.random.year = leto more.random.anyyear = katerokoli more.random.folder = imenik more.random.anyfolder = katerikoli -more.apps.title = Libresonic aplikacije -more.apps.text =

                                    Preverite vedno ve\u010Dji seznam Libresonic aplikacij. \ +more.apps.title = Airsonic aplikacije +more.apps.text =

                                    Preverite vedno ve\u010Dji seznam Airsonic aplikacij. \ Te aplikacije vam omogo\u010Dajo nove in bolj zabavne na\u010Dine dostopa do va\u0161e medijske zbirke \u2013 ne glede na to kje se nahajate. \ Aplikacije so na voljo za Android, iPhone, Windows Phone, BlackBerry, Roku in mnoge druge naprave.

                                    more.mobile.title = Mobilni telefon @@ -244,13 +244,13 @@ upload.unzipped = Razpakirano: {0} # help.jsp help.title = O programu {0} help.upgrade = Pozor! Na vojo je nova razli\u010Dica. Prenesite {0} {1} \ - tukaj. + tukaj. help.version.title = Razli\u010Dica help.builddate.title = Izdelana dne help.server.title = Stre\u017Enik help.license.title = Licenca help.license.text = {0} je zastonj program na voljo pod GPL odprtokodno licenco. \ - {0} uporablja licencirane knji\u017Eice tretjih oseb. {0} ni \ + {0} uporablja licencirane knji\u017Eice tretjih oseb. {0} ni \ namenjen razpe\u010Devanju ilegalnega in piratskega materiala. Vedno upo\u0161tevajte zakone, ki veljajo v va\u0161i dr\u017Eavi. help.homepage.title = Spletna stran help.forum.title = Forum @@ -259,7 +259,7 @@ help.contact.title = Kontakt help.contact.text = {0} je razvil in vzdr\u017Euje Sindre Mehus \ (sindre@activeobjects.no). \ \u010Ce imate vpra\u0161anja, pripombe ali predloge za izbolj\u0161ave, obi\u0161\u010Dite \ - Libresonicov forum. + Airsonicov forum. help.log = Dnevnik help.logfile = Celotna datoteka z dnevnikom je shranjena v {0}. @@ -439,8 +439,8 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Predvajanje glasbe neposredno v spletnem brskalniku z uporabo integriranega Flash predvajalnika. playersettings.technology.external.text = Predvajanje glasbe z va\u0161im najljub\u0161im zunanjim predvajalnikom, kot je npr. WinAmp ali Windows Media Player. playersettings.technology.external_with_playlist.text = Isto kot zgoraj, le da zunanji predvajalnik ureja tudi sezname predvajanja in le-teh ne ureja \ - Libresonic stre\u017Enik. V tem na\u010Dinu je mogo\u010De "preskakovanje" skladb. -playersettings.technology.jukebox.text = Predvajanje glasbe neposredno s pomo\u010Djo zvo\u010Dne naprave Libresonic stre\u017Enika. (Uporaba je dovoljena le avtoriziranim uporbanikom). + Airsonic stre\u017Enik. V tem na\u010Dinu je mogo\u010De "preskakovanje" skladb. +playersettings.technology.jukebox.text = Predvajanje glasbe neposredno s pomo\u010Djo zvo\u010Dne naprave Airsonic stre\u017Enika. (Uporaba je dovoljena le avtoriziranim uporbanikom). playersettings.name = Ime predvajalnika playersettings.coverartsize = Velikost slik ovitkov playersettings.maxbitrate = Najve\u010Dja bitna hitrost @@ -580,7 +580,7 @@ share.facebook = Daj v skupno uporabo na Facebook share.twitter = Daj v skupno uporaba na Twitter share.googleplus = Daj v skupno uporaba na Google+ share.link = Ali pa dajte datoteko v skupno uporabo tako, da jim po\u0161ljete to povezavo: {0} -share.disabled = \u010Ce \u017Eelite deliti va\u0161o glasbo z drugimi, si morate najprej ustvariti svoj libresonic.org naslov.
                                    \ +share.disabled = \u010Ce \u017Eelite deliti va\u0161o glasbo z drugimi, si morate najprej ustvariti svoj airsonic.org naslov.
                                    \ To lahko storite pod Nastavitve > Omre\u017Eje (potrebovali boste administratorske pravice). share.manage = Upravljanje z vsebinami v skupni uporabi diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties index 85a69dcf..9b534cae 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties @@ -29,7 +29,7 @@ login.login = Logga in login.remember = Kom ih\u00E5g login.logout = Du \u00E4r nu loggat ut. V\u00E4lkommen tillbaka! login.error = Fel anv\u00E4ndarID eller l\u00F6senord. -login.insecure = Libresonic \u00E4r inte s\u00E4kert. V\u00E4nligen logga in med anv\u00E4ndarID och
                                    l\u00F6senord "admin". Byt sen l\u00F6senord omedlebart. +login.insecure = Airsonic \u00E4r inte s\u00E4kert. V\u00E4nligen logga in med anv\u00E4ndarID och
                                    l\u00F6senord "admin". Byt sen l\u00F6senord omedlebart. # accessDenied.jsp accessDenied.title = \u00C5tkomst nekad @@ -44,8 +44,8 @@ top.podcast = Podcast top.more = Mer top.help = Hj\u00E4lp top.search = S\u00F6k -top.upgrade = En ny verson \u00E4r tillg\u00E4nglig. Ladda ner Libresonic {0} \ - h\u00E4r. +top.upgrade = En ny verson \u00E4r tillg\u00E4nglig. Ladda ner Airsonic {0} \ + h\u00E4r. top.missing = Ingen musikmapp \u00E4r funnen. V\u00E4nligen \u00E4ndra inst\u00E4llningar. top.logout = Logga ut {0} @@ -113,14 +113,14 @@ search.hits.songs = L\u00E5tar # gettingStarted.jsp gettingStarted.title = Kom ig\u00E5ng -gettingStarted.text =

                                    V\u00E4lkommen till Libresonic! F\u00F6r att komma ig\u00E5ng p\u00E5 nolltid, f\u00F6lj bara stegen nedan.
                                    \ +gettingStarted.text =

                                    V\u00E4lkommen till Airsonic! F\u00F6r att komma ig\u00E5ng p\u00E5 nolltid, f\u00F6lj bara stegen nedan.
                                    \ Klicka p\u00E5 "Hem"-knappen ovan f\u00F6r att \u00E5ter komma till denna sida.

                                    \ -

                                    F\u00F6r mer information, v\u00E4nligen se Att komma ig\u00E5ng guide.

                                    +

                                    F\u00F6r mer information, v\u00E4nligen se Att komma ig\u00E5ng guide.

                                    gettingStarted.step1.title = \u00C4ndra administrationsl\u00F6senordet. gettingStarted.step1.text = S\u00E4kra din server genom att \u00E4ndra standardl\u00F6senordet till kontot f\u00F6r administration. \ Du kan ocks\u00E5 l\u00E4gga till anv\u00E4ndare med olika privilegier. gettingStarted.step2.title = S\u00E4tt upp mediamappar. -gettingStarted.step2.text = Tala om f\u00F6r Libresonic s\u00F6kv\u00E4gen till din musik och dina videos. +gettingStarted.step2.text = Tala om f\u00F6r Airsonic s\u00F6kv\u00E4gen till din musik och dina videos. gettingStarted.step3.title = Konfigurera inst\u00E4llningarna f\u00F6r n\u00E4tverket. gettingStarted.hide = Visa inte detta igen gettingStarted.hidealert = F\u00F6r att visa denn info igen, g\u00E5 till Inst\u00E4llningar > Allm\u00E4nt. @@ -161,11 +161,11 @@ more.random.year = och \u00E5r more.random.anyyear = alla more.random.folder = i mapp more.random.anyfolder = vilken som helst -more.apps.title = Libresonic Apps -more.apps.text =

                                    Libresonic apps finns tillg\u00E4nglig f\u00F6r Android, iPhone, \ +more.apps.title = Airsonic Apps +more.apps.text =

                                    Airsonic apps finns tillg\u00E4nglig f\u00F6r Android, iPhone, \ Windows Phone och AIR.

                                    more.mobile.title = Mobil -more.mobile.text =

                                    Du kan kontrollera Libresonic fr\u00E5n en WAP mobil eller PDA.
                                    \ +more.mobile.text =

                                    Du kan kontrollera Airsonic fr\u00E5n en WAP mobil eller PDA.
                                    \ Surfa bara till denna URL fr\u00E5n mobilen: http://yourhostname/wap

                                    \

                                    Det h\u00E4r kr\u00E4ver att din server kan n\u00E5s fr\u00E5n internet.

                                    more.podcast.title = Podcast @@ -188,24 +188,24 @@ upload.failed = Uppladdning misslyckades med f\u00F6ljande error meddelande:
                                    upload.unzipped = Uppackade: {0} # help.jsp -help.title = Om Libresonic -help.upgrade = Note! En ny version \u00E4r tillg\u00E4nglig. Ladda ner Libresonic {0} \ - h\u00E4r. +help.title = Om Airsonic +help.upgrade = Note! En ny version \u00E4r tillg\u00E4nglig. Ladda ner Airsonic {0} \ + h\u00E4r. help.version.title = Version help.builddate.title = Kompilerad help.server.title = Server help.license.title = Licens help.license.text = {0} \u00E4r gratis distribuerad under GPL open-source licens. \ - {0} anv\u00E4nder licensierad 3:e partsprogram. V\u00E4nligen notera att {0} \u00E4r inte \ + {0} anv\u00E4nder licensierad 3:e partsprogram. V\u00E4nligen notera att {0} \u00E4r inte \ ett verktyg f\u00F6r illegal distribution av copyrightskyddat material. Var alltid uppm\u00E4rksam p\u00E5 att f\u00F6lja de relevanta lagar som \u00E4r specifika f\u00F6r ditt land. help.homepage.title = Hemsida help.forum.title = Forum help.shop.title = Handelsvaror help.contact.title = Kontakt -help.contact.text = Libresonic \u00E4r utvecklat och underh\u00E5llet av Sindre Mehus \ +help.contact.text = Airsonic \u00E4r utvecklat och underh\u00E5llet av Sindre Mehus \ (sindre_mehus@users.sourceforge.net). \ Om du har fr\u00E5gor, kommentarer eller f\u00F6rslag p\u00E5 f\u00F6rb\u00E4ttringar, V\u00E4nligen bes\u00F6k \ - Libresonics Forum. + Airsonics Forum. help.log = Logg help.logfile = Den kompletta loggen \u00E4r sparad i {0}. @@ -252,7 +252,7 @@ advancedsettings.ldapurl = LDAP URL advancedsettings.ldapsearchfilter = LDAP s\u00F6k filter advancedsettings.ldapmanagerdn = LDAP manager DN
                                    (Valfritt)
                                    advancedsettings.ldapmanagerpassword = L\u00F6senord -advancedsettings.ldapautoshadowing = Skapa automatiskt anv\u00E4ndare i Libresonic +advancedsettings.ldapautoshadowing = Skapa automatiskt anv\u00E4ndare i Airsonic # personalSettings.jsp personalsettings.title = Personal inst\u00E4llningar f\u00F6r {0} @@ -319,12 +319,12 @@ transcodingsettings.nosourceformat = V\u00E4nligen ange ett format att konverter transcodingsettings.notargetformat = V\u00E4nligen ange ett format att konvertera till. transcodingsettings.nostep1 = V\u00E4nligen ange minst ett transcoding steg. transcodingsettings.info =

                                    (%s = Filen som ska bli transkodad, %b = Max bitrate av spelaren)

                                    \ -

                                    Transkodning \u00E4r en process f\u00F6ratt konvertera ett media format till ett annat. Libresonics transkoding \ +

                                    Transkodning \u00E4r en process f\u00F6ratt konvertera ett media format till ett annat. Airsonics transkoding \ motor till\u00E5ter d\u00E4rigenom str\u00F6mning av format som normalt inte \u00E4r str\u00F6mningsbart. Transkodningen sker on-the-fly och \ kr\u00E4ver inget diskutrymme.

                                    \

                                    Den aktiva transkodningen sker av tredje parts kommadorads program som m\u00E5ste vara installerade i {0}. \ Ett transkodnings paket f\u00F6r Windows \ - \u00E4r tillg\u00E4ngligt h\u00E4r. Du kan l\u00E4gga till egna \ + \u00E4r tillg\u00E4ngligt h\u00E4r. Du kan l\u00E4gga till egna \ transkodningar om de uppfyller dessa krav:\

                                      \
                                    • Det m\u00E5ste g\u00E5 att k\u00F6ra via kommandorad
                                      • \ @@ -374,7 +374,7 @@ playersettings.technology.jukebox.title = Jukebox playersettings.technology.web.text = Spela musik direkt i web browsern genom den integrerade Flash spelaren. playersettings.technology.external.text = Spela musik i din favoritspelare, exempelvis WinAmp eller Windows Media Player. playersettings.technology.external_with_playlist.text = Samma som ovan, men spellistan hanteras av spelaren, ist\u00E4llet f\u00F6r \ - Libresonic servern. Med det h\u00E4r l\u00E4get aktivt \u00E4r det m\u00F6jligt att hoppa mellan l\u00E5tar. + Airsonic servern. Med det h\u00E4r l\u00E4get aktivt \u00E4r det m\u00F6jligt att hoppa mellan l\u00E5tar. playersettings.technology.jukebox.text = Spela musik direkt p\u00E5 ljudkortet p\u00E5 servern. (Endast auktoriserade anv\u00E4ndare). playersettings.name = Spelarens namn playersettings.coverartsize = Omslagsbildens storlek @@ -507,7 +507,7 @@ share.facebook = Dela p\u00E5 Facebook share.twitter = Dela p\u00E5 Twitter share.googleplus = Dela p\u00E5 Google+ share.link = Eller dela genom att skicka denna l\u00E4nk: {0} -share.disabled = F\u00F6r att kunna dela med dig m\u00E5ste du f\u00F6rst registrera din egna libresonic.org adress.
                                      \ +share.disabled = F\u00F6r att kunna dela med dig m\u00E5ste du f\u00F6rst registrera din egna airsonic.org adress.
                                      \ V\u00E4nligen g\u00E5 till Inst\u00E4llningar > N\u00E4tverk (adminr\u00E4ttigheter kr\u00E4vs). share.manage = Hantera min delade media @@ -539,19 +539,19 @@ lyrics.courtesy = (Lyrik av h\u00E4r \ @@ -611,14 +611,14 @@ helppopup.ldapsearchfilter.text =

                                      S\u00F6k filtret anger vilket attribut som helppopup.ldapmanagerdn.title = LDAP anv\u00E4ndare DN helppopup.ldapmanagerdn.text =

                                      Om LDAP servern in till\u00E5ter anonym s\u00F6kningm\u00E5ste du speficera DN p\u00E5 den anv\u00E4ndare som till\u00E5ts \ ( DN = Distinguished Name) och l\u00F6senord.

                                      -helppopup.ldapautoshadowing.title = Skapa A tomatiskt LDAP anv\u00E4ndare i Libresonic -helppopup.ldapautoshadowing.text =

                                      Med det h\u00E4r valet aktiverat, beh\u00F6ver du inte att manuellt skapa LDAP konton i Libresonic innan inloggning.

                                      \ -

                                      OBS! Detta val inneb\u00E4r att alla anv\u00E4ndare med ett aktivt LDAP konto kan logga in i Libresonic, \ +helppopup.ldapautoshadowing.title = Skapa A tomatiskt LDAP anv\u00E4ndare i Airsonic +helppopup.ldapautoshadowing.text =

                                      Med det h\u00E4r valet aktiverat, beh\u00F6ver du inte att manuellt skapa LDAP konton i Airsonic innan inloggning.

                                      \ +

                                      OBS! Detta val inneb\u00E4r att alla anv\u00E4ndare med ett aktivt LDAP konto kan logga in i Airsonic, \ \u00E4r det det du vill?

                                      helppopup.playername.title = Spelarensnamn helppopup.playername.text =

                                      L\u00E5ter dig specificera ett namn som \u00E4r l\u00E4tt att komma ih\u00E5g p\u00E5 den spelare, som tex "Jobb" eller "Vardagsrum".

                                      helppopup.autocontrol.title = Kontrollera spelare automatiskt -helppopup.autocontrol.text =

                                      Med det h\u00E4r valet aktivt, kommer Libresonic automatiskt att starta spelaren n\u00E4r du klickar p\u00E5 "Spela" \ +helppopup.autocontrol.text =

                                      Med det h\u00E4r valet aktivt, kommer Airsonic automatiskt att starta spelaren n\u00E4r du klickar p\u00E5 "Spela" \ i spellistan. Annars m\u00E5ste du starta spelaren manuellt.

                                      helppopup.dynamicip.title = Dynamisk IP address helppopup.dynamicip.text =

                                      St\u00E4ng av detta val om spelaren har en fast IP address.

                                      diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties index 48ca2305..1d54b92c 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties @@ -62,7 +62,7 @@ top.more = \u5176\u4ED6 top.help = \u5173\u4E8E top.search = \u67E5\u627E top.upgrade = \u6709\u65B0\u7248\u672C\u63D0\u4F9B. \u4E0B\u8F7D {0} {1} \ - . + . top.missing = \u627E\u4E0D\u5230\u5A92\u4F53\u6587\u4EF6\u5939\uFF0C\u8BF7\u91CD\u65B0\u8BBE\u7F6E. top.logout =\u6CE8\u9500{0} @@ -160,11 +160,11 @@ search.hits.songs = \u66F2\u76EE # gettingStarted.jsp gettingStarted.title = \u521D\u6B21\u4F7F\u7528 -gettingStarted.text =

                                      \u6B22\u8FCE\u4F7F\u7528Libresonic!
                                      \u8BF7\u4F9D\u7167\u4E0B\u9762\u7684\u6B65\u9AA4\u8BBE\u7F6E.
                                      \ +gettingStarted.text =

                                      \u6B22\u8FCE\u4F7F\u7528Airsonic!
                                      \u8BF7\u4F9D\u7167\u4E0B\u9762\u7684\u6B65\u9AA4\u8BBE\u7F6E.
                                      \ \u70B9\u51FB\u5DE5\u5177\u5217\u4E0A\u7684"\u9996\u9875"\uFF0C\u5C31\u80FD\u968F\u65F6\u56DE\u6765\u8FD9\u91CC\uFF01.

                                      \ -

                                      \u9700\u8981\u66F4\u591A\u8BAF\u606F\u8BF7\u53C2\u8003\u5165\u95E8\u6307\u5357

                                      -gettingStarted.root = \u8B66\u544A! Libresonic \u8FDB\u7A0B\u6B63\u5728\u4EE5root\u7528\u6237\u8FD0\u884C. \u8BF7\u8003\u8651\ - \u66F4\u6362. +

                                      \u9700\u8981\u66F4\u591A\u8BAF\u606F\u8BF7\u53C2\u8003\u5165\u95E8\u6307\u5357

                                      +gettingStarted.root = \u8B66\u544A! Airsonic \u8FDB\u7A0B\u6B63\u5728\u4EE5root\u7528\u6237\u8FD0\u884C. \u8BF7\u8003\u8651\ + \u66F4\u6362. gettingStarted.step1.title = \u4FEE\u6539\u7BA1\u7406\u5458\u7684\u5BC6\u7801. gettingStarted.step1.text = \u8BF7\u4FEE\u6539\u9884\u8BBE\u7684\u7BA1\u7406\u5458\u5BC6\u7801\uFF0C\u4EE5\u786E\u4FDD\u670D\u52A1\u5668\u7684\u5B89\u5168\u3002\ \u4E5F\u53EF\u4EE5\u5EFA\u7ACB\u65B0\u7684\u7528\u6237\u5E76\u7ED9\u4E88\u4E0D\u540C\u7684\u6743\u9650 @@ -214,9 +214,9 @@ more.random.year = \u5E74\u4EFD more.random.anyyear = \u4EFB\u610F more.random.folder = \u5A92\u4F53\u6587\u4EF6\u5939 more.random.anyfolder = \u4EFB\u610F -more.apps.title = Libresonic \u5E94\u7528 +more.apps.title = Airsonic \u5E94\u7528 more.apps.text =

                                      \u652F\u6301 iPhone, Android \u548C AIR\u7684\ - Libresonic \u5E94\u7528.\ + Airsonic \u5E94\u7528.\

                                      more.mobile.title = \u79FB\u52A8\u8BBE\u5907 more.mobile.text =

                                      \u53EF\u4EE5\u7531WAP\u7535\u8BDD\u6216PDA\u4F7F\u7528 {0} .
                                      \ @@ -244,14 +244,14 @@ upload.unzipped = \u89E3\u538B\u7F29 {0} # help.jsp help.title = \u5173\u4E8E {0} help.upgrade = \u6CE8\u610F! \u5DF2\u7ECF\u6709\u65B0\u7684\u7248\u672C\u4E86\uFF0C\u4E0B\u8F7D\u65B0\u7248 {0} {1} \ - \u8FDE\u63A5. + \u8FDE\u63A5. help.version.title = \u7248\u672C help.builddate.title = \u65E5\u671F help.server.title = \u670D\u52A1\u5668 help.license.title = \u6388\u6743 help.license.text = {0} \u662F\u4EE5 \ GPL \u578B\u5F0F\u53D1\u5E03\u6388\u6743\u7684\u81EA\u7531\u8F6F\u4EF6.
                                      \ - {0} \u4F7F\u7528\u4E86 \u7B2C\u4E09\u65B9\u6388\u6743. + {0} \u4F7F\u7528\u4E86 \u7B2C\u4E09\u65B9\u6388\u6743. help.homepage.title = \u9996\u9875 help.forum.title = \u8BBA\u575B help.shop.title = \u5546\u54C1 @@ -259,7 +259,7 @@ help.contact.title = \u8054\u7CFB help.contact.text = {0} \u7531 Sindre Mehus \u5F00\u53D1\u53CA\u7EF4\u62A4 \ (sindre@activeobjects.no). \ \u5982\u679C\u60A8\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u610F\u89C1\u6216\u5EFA\u8BAE\u6539\u5584\uFF0C\u8BF7\u5230 \ - Libresonic\u8BBA\u575B. + Airsonic\u8BBA\u575B. help.log = \u65E5\u5FD7 help.logfile = \u5B8C\u6574\u7684\u65E5\u5FD7\u5B58\u653E\u5728 {0}. @@ -371,10 +371,10 @@ musicfoldersettings.fastcache = \u5FEB\u901F\u6A21\u5F0F musicfoldersettings.fastcache.description = \u8FD9\u4E2A\u9009\u9879\u53EF\u4EE5\u51CF\u5C11\u786C\u76D8\u5F00\u9500, \u5982\u679C\u5A92\u4F53\u6587\u4EF6\u4F4D\u4E8E\u7F51\u7EDC\u4F4D\u7F6E\u6B64\u9009\u9879\u5C31\u5F88\u6709\u7528. \ \u6CE8\u610F: \u6587\u4EF6\u7684\u4FEE\u6539\u53EA\u6709\u5728\u5A92\u4F53\u626B\u63CF\u540E\u624D\u751F\u6548. musicfoldersettings.expunge = \u6E05\u7406\u6570\u636E\u5E93 -musicfoldersettings.expunge.description = Libresonic \u4F1A\u8BB0\u5F55\u5B83\u9047\u5230\u7684\u6240\u6709\u5A92\u4F53\u6587\u4EF6\u7684\u4FE1\u606F,\u5982\u679C\u6E05\u7406\u4E86\u6570\u636E\u5E93,\ +musicfoldersettings.expunge.description = Airsonic \u4F1A\u8BB0\u5F55\u5B83\u9047\u5230\u7684\u6240\u6709\u5A92\u4F53\u6587\u4EF6\u7684\u4FE1\u606F,\u5982\u679C\u6E05\u7406\u4E86\u6570\u636E\u5E93,\ \u8FD9\u4E9B\u4FE1\u606F\u4F1A\u5168\u90E8\u88AB\u5220\u9664. musicfoldersettings.organizebyfolderstructure = \u6309\u7167\u6587\u4EF6\u5939\u7ED3\u6784\u6574\u7406 -musicfoldersettings.organizebyfolderstructure.description = \u4F7F\u7528\u8FD9\u4E2A\u9009\u9879\u4F7F Libresonic \u6309\u7167\u539F\u59CB\u7684\u6587\u4EF6\u5939\u7ED3\u6784\u6D4F\u89C8\u66F2\u76EE,\u800C\u4E0D\u662F\u6309\u827A\u672F\u5BB6/\u4E13\u8F91\u7684\u65B9\u5F0F\u6D4F\u89C8 +musicfoldersettings.organizebyfolderstructure.description = \u4F7F\u7528\u8FD9\u4E2A\u9009\u9879\u4F7F Airsonic \u6309\u7167\u539F\u59CB\u7684\u6587\u4EF6\u5939\u7ED3\u6784\u6D4F\u89C8\u66F2\u76EE,\u800C\u4E0D\u662F\u6309\u827A\u672F\u5BB6/\u4E13\u8F91\u7684\u65B9\u5F0F\u6D4F\u89C8 # transcodingSettings.jsp transcodingsettings.name = \u540D\u79F0 @@ -394,7 +394,7 @@ transcodingsettings.info =

                                      (%s = \u6587\u4EF6\u5C06\u88AB\u8F6

                                      \u8F6C\u7801\u8FC7\u7A0B\u662F\u7531\u4E00\u4E2A\u97F3\u4E50\u683C\u5F0F\u7BA1\u6362\u6210\u53E6\u4E00\u79CD\u683C\u5F0F.
                                      \ {1}\u7684\u8F6C\u7801\u5F15\u64CE\u5C06\u975E\u4E32\u6D41\u683C\u5F0F\u8F6C\u6362\u6210\u4E32\u6D41. \u76F4\u63A5\u8F6C\u7801\u5E76\u4E14\u4E0D\u9700\u8981\u78C1\u76D8\u8FD0\u4F5C

                                      \

                                      \u5B9E\u9645\u7684\u4E13\u6362\u901A\u5E38\u662F\u901A\u8FC7\u7B2C\u4E09\u65B9\u8F6F\u4EF6\u4EE5\u547D\u4EE4\u5217\u65B9\u5F0F\u8F6C\u6362\uFF0C\u7A0B\u5E8F\u5B89\u88C5\u5728 {0}.

                                      \ -

                                      \u800CWindows\u7CFB\u7EDF\u7684\u8F6C\u6362\u7A0B\u5E8F\u53EF\u4EE5\u5728\u8FD9\u91CC\u627E\u5230. \ +

                                      \u800CWindows\u7CFB\u7EDF\u7684\u8F6C\u6362\u7A0B\u5E8F\u53EF\u4EE5\u5728\u8FD9\u91CC\u627E\u5230. \ \u60A8\u4E5F\u80FD\u4EE5\u81EA\u5B9A\u7684\u8F6C\u6362\uFF0C\u53EA\u8981\u6EE1\u8DB3\u4E0B\u9762\u8981\u6C42\uFF1A\

                                        \
                                      • \u5FC5\u987B\u4EE5\u4E00\u4E2A\u547D\u4EE4\u884C\u6307\u4EE4\u754C\u9762.
                                        • \ @@ -441,9 +441,9 @@ playersettings.technology.external_with_playlist.title = \u4EE5\u64AD\u653E\u521 playersettings.technology.jukebox.title = \u70B9\u64AD\u673A\u6A21\u5F0F playersettings.technology.web.text = \u76F4\u63A5\u5728\u7F51\u9875\u4E2D\u7684Flash\u64AD\u653E\u5668\u64AD\u653E. playersettings.technology.external.text = \u5728\u60A8\u5E38\u7528\u7684\u64AD\u653E\u5668\u4E2D\u64AD\u653E\uFF0C\u4F8B\u5982:WinAmp\u3001Windows Media Player\u3001iTunes. -playersettings.technology.external_with_playlist.text = \u5982\u540C\u4E0A\u9762\u7684\u9009\u9879\uFF0C\u4F46\u662F\u64AD\u653E\u5217\u8868\u7531\u5BA2\u6237\u7AEF\u64AD\u653E\u5668\u7BA1\u7406\uFF0C\u800C\u4E0D\u662FLibresonic\u670D\u52A1\u5668
                                        \ +playersettings.technology.external_with_playlist.text = \u5982\u540C\u4E0A\u9762\u7684\u9009\u9879\uFF0C\u4F46\u662F\u64AD\u653E\u5217\u8868\u7531\u5BA2\u6237\u7AEF\u64AD\u653E\u5668\u7BA1\u7406\uFF0C\u800C\u4E0D\u662FAirsonic\u670D\u52A1\u5668
                                        \ \u8FD9\u79CD\u6A21\u5F0F\u8DF3\u8F6C\u66F4\u4E3A\u65B9\u4FBF\u3002 -playersettings.technology.jukebox.text = \u76F4\u63A5\u5728Libresonic\u670D\u52A1\u5668\u4E2D\u64AD\u653E. (\u9650\u5DF2\u6388\u6743\u7684\u7528\u6237). +playersettings.technology.jukebox.text = \u76F4\u63A5\u5728Airsonic\u670D\u52A1\u5668\u4E2D\u64AD\u653E. (\u9650\u5DF2\u6388\u6743\u7684\u7528\u6237). playersettings.name = \u64AD\u653E\u5668\u540D\u79F0 playersettings.coverartsize = \u4E13\u8F91\u5C01\u9762\u5927\u5C0F playersettings.maxbitrate = \u6700\u5927\u6BD4\u7279\u7387 @@ -584,7 +584,7 @@ share.facebook = \u5728Facebook\u4E0A\u5171\u4EAB share.twitter = \u5728Twitter\u4E0A\u5171\u4EAB share.googleplus = \u5728Google+\u4E0A\u5171\u4EAB share.link = \u6216\u901A\u8FC7\u90AE\u4EF6\u53D1\u9001\u8FDE\u63A5: {0} -share.disabled = \u4F7F\u7528\u5171\u4EAB\u9700\u8981\u9996\u5148\u6CE8\u518C\u4F60\u7684 libresonic.org \u5730\u5740.
                                        \ +share.disabled = \u4F7F\u7528\u5171\u4EAB\u9700\u8981\u9996\u5148\u6CE8\u518C\u4F60\u7684 airsonic.org \u5730\u5740.
                                        \ \u8BF7\u5230\u8BBE\u7F6E > \u7F51\u7EDC (\u9700\u8981\u7BA1\u7406\u5458\u6743\u9650) share.manage = \u7BA1\u7406\u6211\u5171\u4EAB\u7684\u5A92\u4F53 diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties index 64c9d881..bb798aed 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties @@ -71,7 +71,7 @@ top.more = \u5176\u4ED6 top.help = \u95DC\u65BC top.search = \u641C\u5C0B top.upgrade = \u6709\u65B0\u7248\u672C\u63D0\u4F9B. \u4E0B\u8F09 {0} {1} \ - \u9019\u88E1\u3002 + \u9019\u88E1\u3002 top.missing = \u627E\u4E0D\u5230\u97F3\u6A02\u8CC7\u6599\u593E\uFF0C\u8ACB\u91CD\u65B0\u8A2D\u5B9A\u3002 top.logout =\u767B\u51FA {0} @@ -175,19 +175,19 @@ search.hits.videos = \u5F71\u50CF # gettingStarted.jsp gettingStarted.title = \u521D\u6B21\u4F7F\u7528 -gettingStarted.text =

                                        \u6B61\u8FCE\u4F7F\u7528Libresonic\uFF01
                                        \u8ACB\u4F9D\u7167\u4E0B\u9762\u7684\u6B65\u9A5F\u8A2D\u5B9A\u3002
                                        \ +gettingStarted.text =

                                        \u6B61\u8FCE\u4F7F\u7528Airsonic\uFF01
                                        \u8ACB\u4F9D\u7167\u4E0B\u9762\u7684\u6B65\u9A5F\u8A2D\u5B9A\u3002
                                        \ \u9EDE\u64CA\u5DE5\u5177\u5217\u4E0A\u7684\u300C\u9996\u9801\u300D\uFF0C\u5C31\u80FD\u96A8\u6642\u56DE\u4F86\u9019\u88E1\u3002

                                        \ -

                                        \u9700\u8981\u66F4\u591A\u8A0A\u606F\u8ACB\u53C3\u8003\u5165\u9580\u6307\u5357

                                        -gettingStarted.root = \u8B66\u544A\uFF01Libresonic\u7A0B\u5F0F\u6B63\u4EE5 root \u4F7F\u7528\u8005\u57F7\u884C\u3002\u8ACB\u8003\u616E \ - \u5225\u7684\u65B9\u5F0F\u3002 +

                                        \u9700\u8981\u66F4\u591A\u8A0A\u606F\u8ACB\u53C3\u8003\u5165\u9580\u6307\u5357

                                        +gettingStarted.root = \u8B66\u544A\uFF01Airsonic\u7A0B\u5F0F\u6B63\u4EE5 root \u4F7F\u7528\u8005\u57F7\u884C\u3002\u8ACB\u8003\u616E \ + \u5225\u7684\u65B9\u5F0F\u3002 gettingStarted.step1.title = \u8B8A\u66F4\u7BA1\u7406\u54E1\u7684\u5BC6\u78BC\u3002 gettingStarted.step1.text = \u8ACB\u4FEE\u6539\u9810\u8A2D\u7684\u7BA1\u7406\u54E1\u5BC6\u78BC\uFF0C\u4EE5\u78BA\u4FDD\u4F3A\u670D\u5668\u7684\u5B89\u5168\u3002\ \u4E5F\u53EF\u4EE5\u5EFA\u7ACB\u65B0\u7684\u4F7F\u7528\u8005\u4E26\u7D66\u4E88\u4E0D\u540C\u7684\u6B0A\u9650\u3002 gettingStarted.step2.title = \u8A2D\u5B9A\u97F3\u6A02\u8CC7\u6599\u593E\u3002 gettingStarted.step2.text = \u8A2D\u5B9A\u60A8\u97F3\u6A02\u6240\u653E\u7F6E\u7684\u8CC7\u6599\u593E\u3002 gettingStarted.step3.title = \u914D\u7F6E\u7DB2\u8DEF\u8A2D\u5B9A\u3002 -gettingStarted.step3.text = \u5982\u679C\u60A8\u60F3\u8981\u9060\u7AEF\u4EAB\u53D7 Libresonic\uFF0C\u60A8\u53EF\u80FD\u9700\u8981\u95B1\u8B80 \ - \u4EE3\u7406\u4F3A\u670D\u5668\u6587\u4EF6 \ \u5176\u4E2D\u63D0\u4F9B\u4E86\u8A2D\u5B9A SSL\uFF0CURL \u91CD\u5BEB\u8207\u81EA\u8A02\u4F4D\u5740\u7684\u6559\u5B78\u3002\u53E6\u5916\uFF0C gettingStarted.hide = \u4E0B\u6B21\u4E0D\u986F\u793A\u672C\u9801\uFF01 gettingStarted.hidealert = \u5982\u679C\u4E0B\u6B21\u9084\u9700\u8981\u986F\u793A\u63D0\u793A\uFF0C\u8ACB\u5F9E\u300C\u8A2D\u5B9A\u300D\u2192\u300C\u4E00\u822C\u300D\u4E2D\u52FE\u9078\u3002 @@ -255,8 +255,8 @@ more.random.1month = 1 \u500B\u6708\u524D more.random.3months = 3 \u500B\u6708\u524D more.random.6months = 6 \u500B\u6708\u524D more.random.1year = 1 \u5E74\u524D -more.apps.title = Libresonic Apps -more.apps.text =

                                        \u770B\u770B\u7A69\u5B9A\u589E\u52A0\u7684 Libresonic apps \u6E05\u55AE\u3002 \ +more.apps.title = Airsonic Apps +more.apps.text =

                                        \u770B\u770B\u7A69\u5B9A\u589E\u52A0\u7684 Airsonic apps \u6E05\u55AE\u3002 \ \u9019\u63D0\u4F9B\u4EAB\u53D7\u60A8\u7684\u5A92\u9AD4\u6536\u85CF\u7684\u66FF\u4EE3\u65B9\u5F0F - \u7121\u8AD6\u60A8\u5728\u54EA\u88E1\u3002 \ App \u53EF\u7528\u65BCAndroid\uFF0CiPhone\uFF0CWindows Phone\uFF0CBlackBerry\uFF0CRoku\u7B49\u7B49\u3002

                                        more.status.title = \u7DB2\u8DEF\u72C0\u614B @@ -309,17 +309,17 @@ upload.unzipped = \u89E3\u58D3\u7E2E {0} # help.jsp help.title = \u95DC\u65BC {0} help.upgrade = \u6CE8\u610F\uFF01 \u6709\u65B0\u7248\u672C\u53EF\u7528\u3002\u4E0B\u8F09 {0} {1} \ - \u8ACB\u9EDE\u9078\u9019\u88E1\u3002 + \u8ACB\u9EDE\u9078\u9019\u88E1\u3002 help.version.title = \u7248\u672C help.builddate.title = \u65E5\u671F help.server.title = \u4F3A\u670D\u5668 help.license.title = \u6388\u6B0A -help.license.text = {0} \u662F\u4EE5 GPL \u578B\u5F0F\u767C\u4F48\u6388\u6B0A\u7684\u81EA\u7531\u8EDF\u9AD4\u3002
                                        {0} \u4F7F\u7528 \u7B2C\u4E09\u65B9\u6388\u6B0A\u3002 +help.license.text = {0} \u662F\u4EE5 GPL \u578B\u5F0F\u767C\u4F48\u6388\u6B0A\u7684\u81EA\u7531\u8EDF\u9AD4\u3002
                                        {0} \u4F7F\u7528 \u7B2C\u4E09\u65B9\u6388\u6B0A\u3002 help.homepage.title = \u9996\u9801 help.forum.title = \u8AD6\u58C7 help.shop.title = \u5546\u54C1 help.contact.title = \u806F\u7E6B -help.contact.text = Libresonic \u662F\u793E\u7FA4\u5C08\u6848\u3002 \u60A8\u53EF\u4EE5\u5728 Freenode \u4E0A\u7684 #libresonic \u627E\u5230\u6211\u5011\u3002\u6280\u8853\u554F\u984C\u53EF\u4EE5\u63D0\u4EA4\u5230 Github \u4E0A\u7684\u554F\u984C\u8FFD\u8E64\u5668\u3002 +help.contact.text = Airsonic \u662F\u793E\u7FA4\u5C08\u6848\u3002 \u60A8\u53EF\u4EE5\u5728 Freenode \u4E0A\u7684 #airsonic \u627E\u5230\u6211\u5011\u3002\u6280\u8853\u554F\u984C\u53EF\u4EE5\u63D0\u4EA4\u5230 Github \u4E0A\u7684\u554F\u984C\u8FFD\u8E64\u5668\u3002 help.log = \u8A18\u9304 help.logfile = \u5B8C\u6574\u7684\u7D00\u9304\u5B58\u653E\u5728 {0}\u3002 @@ -453,7 +453,7 @@ musicfoldersettings.fastcache = \u5FEB\u901F\u8B80\u53D6\u6A21\u5F0F musicfoldersettings.fastcache.description = \u4F7F\u7528\u9019\u500B\u9078\u9805\u4F86\u6E1B\u5C11\u78C1\u789F\u5B58\u53D6\u3002\u4F8B\u5982\uFF0C\u5982\u679C\u60A8\u7684\u5A92\u9AD4\u6A94\u6848\u4F4D\u65BC\u7DB2\u8DEF\u78C1\u789F\u3002 \ \u6CE8\u610F\uFF1A\u65B0\u589E\u6216\u66F4\u6539\u7684\u6A94\u6848\u53EA\u6709\u5728\u6383\u63CF\u97F3\u6A02\u8CC7\u6599\u593E\u5F8C\u624D\u6703\u51FA\u73FE\u3002 musicfoldersettings.expunge = \u6E05\u7406\u8CC7\u6599\u5EAB -musicfoldersettings.expunge.description = Libresonic \u5132\u5B58\u4E86\u6240\u6709\u5A92\u9AD4\u6A94\u6848\u7684\u8CC7\u8A0A\u3002 \ +musicfoldersettings.expunge.description = Airsonic \u5132\u5B58\u4E86\u6240\u6709\u5A92\u9AD4\u6A94\u6848\u7684\u8CC7\u8A0A\u3002 \ \u6E05\u7406\u8CC7\u6599\u5EAB\u5F8C\uFF0C\u4E0D\u5728\u60A8\u7684\u5A92\u9AD4\u8CC7\u6599\u5EAB\u5167\u7684\u6A94\u6848\uFF0C\u5176\u8CC7\u8A0A\u5C07\u6C38\u4E45\u522A\u9664\u3002 musicfoldersettings.organizebyfolderstructure = \u4EE5\u8CC7\u6599\u593E\u7D50\u69CB\u6574\u7406 musicfoldersettings.organizebyfolderstructure.description = \u958B\u555F\u9019\u500B\u9078\u9805\u4F7F\u60A8\u700F\u89BD\u5A92\u9AD4\u8CC7\u6599\u5EAB\u6642\u4F7F\u7528\u539F\u4F86\u7684\u8CC7\u6599\u593E\u7D50\u69CB\uFF0C\u800C\u4E0D\u662F\u4F9D\u7167 ID3 \u6A19\u7C64\u5167\u7684\u4F5C\u8005\u8207\u5C08\u8F2F\u8CC7\u8A0A\u3002 @@ -525,7 +525,7 @@ playersettings.technology.web.text = \u76F4\u63A5\u5728\u7DB2\u9801\u4E2D\u7684 playersettings.technology.external.text = \u5728\u60A8\u5E38\u7528\u7684\u64AD\u653E\u5668\u4E2D\u64AD\u653E\uFF0C\u4F8B\u5982\uFF1AWinAmp\u3001Windows Media Player\u3001iTunes\u3002 playersettings.technology.external_with_playlist.text = \u5982\u540C\u4E0A\u9762\u7684\u9078\u9805\uFF0C\u4F46\u662F\u64AD\u653E\u6E05\u55AE\u7531\u5BA2\u6236\u7AEF\u7BA1\u7406\uFF0C\u800C\u4E0D\u662F\u4F3A\u670D\u5668\u3002 \ \u5728\u9019\u500B\u6A21\u5F0F\u4E2D\u53EF\u4EE5\u8DF3\u8457\u64AD\u653E\u3002 -playersettings.technology.jukebox.text = \u76F4\u63A5\u5728Libresonic\u4F3A\u670D\u5668\u4E2D\u64AD\u653E\u3002(\u9650\u5DF2\u6388\u6B0A\u7684\u7528\u6236\u3002) +playersettings.technology.jukebox.text = \u76F4\u63A5\u5728Airsonic\u4F3A\u670D\u5668\u4E2D\u64AD\u653E\u3002(\u9650\u5DF2\u6388\u6B0A\u7684\u7528\u6236\u3002) playersettings.name = \u64AD\u653E\u5668\u540D\u7A31 playersettings.maxbitrate = \u6700\u5927\u50B3\u8F38\u7387 playersettings.notranscoder = \u6CE8\u610F: \u8F49\u78BC\u5F15\u64CE\u5C1A\u672A\u5B89\u88DD\u3002
                                        \u9EDE\u9078\u300C\u8AAA\u660E\u300D\u7372\u5F97\u66F4\u591A\u8CC7\u8A0A\u3002 @@ -538,19 +538,19 @@ playersettings.forget = \u522A\u9664\u64AD\u653E\u5668 playersettings.clone = \u8907\u88FD\u64AD\u653E\u5668 dlnasettings.enabled = \u555F\u7528 DLNA \u4F3A\u670D\u5668 -dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Libresonic, \ +dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Airsonic, \ and stream your media to compatible DLNA players. Requires restart. dlnasettings.servername = Media Server name dlnasettings.servername.description = The name of the Media Server as it will appear in DLNA players. dlnasettings.baselanurl = LAN Server address dlnasettings.lanurl.description = The base LAN address to be used for DLNA resources. \ - An example is http://192.168.0.2/libresonic/ + An example is http://192.168.0.2/airsonic/ sonossettings.enabled = Enable Sonos music service -sonossettings.description = Use this option to turn on the Sonos music service in Libresonic, \ - and stream your media to Sonos devices on your local network. Remember to add Libresonic \ +sonossettings.description = Use this option to turn on the Sonos music service in Airsonic, \ + and stream your media to Sonos devices on your local network. Remember to add Airsonic \ as a music service from your Sonos controller. Visit \ - sonos.libresonic.org for more info. \ + sonos.airsonic.org for more info. \ For trouble-shooting, please see the log. sonossettings.servicename = Music service name sonossettings.servicename.description = The name of the music service as it will appear in the Sonos controller. @@ -603,8 +603,8 @@ usersettings.ok = \u4F7F\u7528\u8005 {0} \u7684\u5BC6\u78BC\u5DF2\u7D93\u8B8A\u6 # databaseSettings.jsp databasesettings.moreinfo = Additional information on database settings can be read at \ - DATABASE.md on the \ - Libresonic github page. + DATABASE.md on the \ + Airsonic github page. databasesettings.configtype = \u8CC7\u6599\u5EAB\u9023\u7DDA\u4F86\u6E90 databasesettings.mysqlvarcharmaxlength = MySQL Varchar Maximum Length databasesettings.usertablequote = User table Quote @@ -709,7 +709,7 @@ share.facebook = \u5206\u4EAB\u81F3 Facebook share.twitter = \u5206\u4EAB\u81F3 Twitter share.googleplus = \u5206\u4EAB\u81F3 Google+ share.link = \u6216\u662F\u900F\u904E\u6B64\u9023\u7D50\u5206\u4EAB\uFF1A{0} -share.disabled = \u8981\u8207\u67D0\u4EBA\u5206\u4EAB\u97F3\u6A02\uFF0C\u60A8\u5FC5\u9808\u5148\u8A3B\u518A\u81EA\u5DF1\u7684 libresonic.org \u4F4D\u5740\u3002
                                        \ +share.disabled = \u8981\u8207\u67D0\u4EBA\u5206\u4EAB\u97F3\u6A02\uFF0C\u60A8\u5FC5\u9808\u5148\u8A3B\u518A\u81EA\u5DF1\u7684 airsonic.org \u4F4D\u5740\u3002
                                        \ \u8ACB\u5230\u300C\u8A2D\u5B9A\u300D\u2192\u300C\u7DB2\u8DEF\u300D (\u9700\u8981\u7BA1\u7406\u54E1\u6B0A\u9650)\u3002 share.manage = \u7BA1\u7406\u6211\u5206\u4EAB\u7684\u5A92\u9AD4 @@ -758,7 +758,7 @@ helppopup.mysqlvarcharmaxlength.title = MySQL Varchar Max Length helppopup.mysqlvarcharmaxlength.text =

                                        MySQL has a maximum row length and as such needs varchar columns to be \ bounded. This value entered here will be the maximum column size.

                                        helppopup.usertablequote.title = User Table Quote -helppopup.usertablequote.text =

                                        The Libresonic users table is named user. This may be a keyword conflict in some \ +helppopup.usertablequote.text =

                                        The Airsonic users table is named user. This may be a keyword conflict in some \ databases such as Postgres. So for postgres, you will want to use the double quote character (") here

                                        helppopup.jndiname.title = Data Source JNDI Lookup Name helppopup.jndiname.text = A JNDI name to lookup a Data Source of type javax.sql.DataSource. This is something that is\ @@ -859,7 +859,7 @@ helppopup.smtpCredentials.text =

                                        \u7528\u4F86\u9023\u63A5\u5230 SMTP \u4F3A\u helppopup.smtpEncryption.title = SMTP \u52A0\u5BC6 helppopup.smtpEncryption.text =

                                        \u9023\u63A5 SMTP \u4F3A\u670D\u5668\u6642\u4F7F\u7528\u7684\u52A0\u5BC6\u65B9\u5F0F\u3002\u9078\u64C7\u300CNone\u300D\u5C07\u4E0D\u52A0\u5BC6\u3002

                                        helppopup.smtpFrom.title = \u4F86\u6E90\u4F4D\u5740 -helppopup.smtpFrom.text =

                                        Libresonic \u4F3A\u670D\u5668\u5BC4\u9001\u6642\u4F7F\u7528\u7684\u4F86\u6E90\u4F4D\u5740\u3002\u5FC5\u9808\u662F\u5408\u6CD5\u7684\u96FB\u5B50\u90F5\u4EF6\u4F4D\u5740\u3002

                                        +helppopup.smtpFrom.text =

                                        Airsonic \u4F3A\u670D\u5668\u5BC4\u9001\u6642\u4F7F\u7528\u7684\u4F86\u6E90\u4F4D\u5740\u3002\u5FC5\u9808\u662F\u5408\u6CD5\u7684\u96FB\u5B50\u90F5\u4EF6\u4F4D\u5740\u3002

                                        # wap/index.jsp wap.index.missing = \u627E\u4E0D\u5230\u97F3\u6A02 diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/default.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default.properties index 58d687b2..eb9492aa 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/default.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/default.properties @@ -1,5 +1,5 @@ -# Definition of the "Libresonic Default" theme. +# Definition of the "Airsonic Default" theme. # Author: Sindre Mehus styleSheet = style/default.css diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties index 7ba47620..e8bdaeda 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties @@ -17,7 +17,7 @@ helpImage = icons/ripserver/help.png helpPopupImage = icons/ripserver/help_small.png homeImage = icons/ripserver/home.png logImage = icons/ripserver/log.png -logoImage = icons/ripserver/libresonic_black.png +logoImage = icons/ripserver/black.png moreImage = icons/ripserver/more.png nowPlayingImage = icons/ripserver/now_playing.png paypalImage = icons/ripserver/paypal.gif diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/themes.txt b/airsonic-main/src/main/resources/org/airsonic/player/theme/themes.txt index f2b71983..99685ab3 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/theme/themes.txt +++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/themes.txt @@ -5,8 +5,8 @@ # # Author: Sindre Mehus -# The original Libresonic theme. -default "Libresonic Default" default_light +# The original Airsonic theme. +default "Airsonic Default" default_light # Theme with dark colors. midnight "2 Minutes To Midnight" default_dark diff --git a/airsonic-main/src/main/resources/servlet.xml b/airsonic-main/src/main/resources/servlet.xml index c34faccd..581620f2 100644 --- a/airsonic-main/src/main/resources/servlet.xml +++ b/airsonic-main/src/main/resources/servlet.xml @@ -13,9 +13,9 @@ http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - + @@ -28,15 +28,15 @@ - + - - + + - + @@ -47,6 +47,6 @@ - + diff --git a/airsonic-main/src/main/webapp/WEB-INF/dwr.xml b/airsonic-main/src/main/webapp/WEB-INF/dwr.xml index 13c4b67c..d19b38f3 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/dwr.xml +++ b/airsonic-main/src/main/webapp/WEB-INF/dwr.xml @@ -40,22 +40,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp index ac66edfb..66937f7a 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1" %> -<%--@elvariable id="command" type="org.libresonic.player.command.AdvancedSettingsCommand"--%> +<%--@elvariable id="command" type="org.airsonic.player.command.AdvancedSettingsCommand"--%> <%@ include file="head.jsp" %> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp index ea4d3afe..de97bfc0 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp @@ -300,7 +300,7 @@ - <%--@elvariable id="song" type="org.libresonic.player.domain.MediaFile"--%> + <%--@elvariable id="song" type="org.airsonic.player.domain.MediaFile"--%> @@ -401,13 +401,13 @@ Upgrade to Subsonic Premium and get:

                                        -

                                        Apps for Android, iPhone, Windows Phone ++.

                                        +

                                        Apps for Android, iPhone, Windows Phone ++.

                                        Video streaming.

                                        Chromecast and Sonos support.

                                        DLNA/UPnP support

                                        Share on Facebook, Twitter, Google+

                                        No ads.

                                        -

                                        Your personal server address: you.libresonic.org

                                        +

                                        Your personal server address: you.airsonic.org

                                        Podcast receiver.

                                        diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp index 12e8b49d..4ba76443 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp @@ -1,19 +1,19 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%-- - ~ This file is part of Libresonic. + ~ This file is part of Airsonic. ~ - ~ Libresonic is free software: you can redistribute it and/or modify + ~ Airsonic 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, + ~ Airsonic 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 . + ~ along with Airsonic. If not, see . ~ ~ Copyright 2014 (C) Sindre Mehus --%> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp index 7e31135b..93a94e2a 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1" %> -<%--@elvariable id="command" type="org.libresonic.player.command.DatabaseSettingsCommand"--%> +<%--@elvariable id="command" type="org.airsonic.player.command.DatabaseSettingsCommand"--%> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp index 4d47ab90..383083cf 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp @@ -1,19 +1,19 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1" %> <%-- - ~ This file is part of Libresonic. + ~ This file is part of Airsonic. ~ - ~ Libresonic is free software: you can redistribute it and/or modify + ~ Airsonic 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, + ~ Airsonic 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 . + ~ along with Airsonic. If not, see . ~ ~ Copyright 2013 (C) Sindre Mehus --%> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp index 9500d1f5..841c33ba 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp @@ -18,8 +18,8 @@

                                        - Libresonic encountered an internal error. You can report this error in the - Libresonic Forum. + Airsonic encountered an internal error. You can report this error in the + Airsonic Forum. Please include the information below.

                                        diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp index fd1e9557..9c669d2b 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp @@ -41,7 +41,7 @@ var list = new Array(); - <%--@elvariable id="song" type="org.libresonic.player.domain.MediaFileWithUrlInfo"--%> + <%--@elvariable id="song" type="org.airsonic.player.domain.MediaFileWithUrlInfo"--%> // TODO: Use video provider for aac, m4a list[${loopStatus.count - 1}] = { @@ -81,7 +81,7 @@

                                        ${empty model.share.description ? model.songs[0].albumName : fn:escapeXml(model.share.username)}

                                        -
                                        Streaming by Libresonic
                                        +
                                        Streaming by Airsonic
                                        diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp index 7b86d1fc..173024ab 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1" %> -<%--@elvariable id="command" type="org.libresonic.player.command.GeneralSettingsCommand"--%> +<%--@elvariable id="command" type="org.airsonic.player.command.GeneralSettingsCommand"--%> <%@ include file="head.jsp" %> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp index 45dea935..ef777b16 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp @@ -9,7 +9,7 @@ " type="text/css"> -Libresonic +Airsonic