improved playlist fetch and editing

app/build.gradle.kts

@@ -36,22 +36,27 @@ android {
  val ampacheUser = properties.getProperty("AMPACHE_USER")
  val ampachePass = properties.getProperty("AMPACHE_PASSWORD")
  val ampacheUrl = properties.getProperty("AMPACHE_URL")
+ val ampacheUrlLocal = properties.getProperty("LOCAL_STABLE_URL")
  val dogmazicPass = properties.getProperty("DOGMAZIC_PASSWORD")
  val dogmazicUser = properties.getProperty("DOGMAZIC_USER")
  val dogmazicEmail = properties.getProperty("DOGMAZIC_EMAIL")
  val errorLogUrl = properties.getProperty("URL_ERROR_LOG")
  val localDevUser = properties.getProperty("LOCAL_DEV_USER")
  val localDevPass = properties.getProperty("LOCAL_DEV_PASSWORD")
+ val localDevUrl = properties.getProperty("LOCAL_DEVELOPMENT_URL")
  val errorReportEmail = properties.getProperty("ERROR_REPORT_EMAIL")
  val pastebinApiKey = properties.getProperty("PASTEBIN_API_KEY")
+ val localNextcloudUser = properties.getProperty("LOCAL_NEXTCLOUD_USER")
+ val localNextcloudPass = properties.getProperty("LOCAL_NEXTCLOUD_PASSWORD")
+ val localNextcloudUrl = properties.getProperty("LOCAL_NEXTCLOUD_URL")
 
  defaultConfig {
  applicationId = "luci.sixsixsix.powerampache2"
  minSdk = 28
  targetSdk = 34
- versionCode = 55
- versionName = "1.00-55"
- val versionQuote = "This version is powered by the beginning of the music revolution (FDroid second release)"
+ versionCode = 56
+ versionName = "1.00-56"
+ val versionQuote = "This version is powered by financial debt"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -65,6 +70,11 @@ android {
 
  buildConfigField("String", "VERSION_QUOTE", "\"$versionQuote\"")
  buildConfigField("String", "ERROR_REPORT_EMAIL", errorReportEmail)
+ buildConfigField("String", "LOCAL_NEXTCLOUD_USER", localNextcloudUser)
+ buildConfigField("String", "LOCAL_NEXTCLOUD_PASSWORD", localNextcloudPass)
+ buildConfigField("String", "LOCAL_NEXTCLOUD_URL", localNextcloudUrl)
+ buildConfigField("String", "DEBUG_LOCAL_STABLE_URL", ampacheUrlLocal)
+ buildConfigField("String", "DEBUG_LOCAL_DEVELOPMENT_URL", localDevUrl)
  }
 
  buildTypes {

app/src/main/java/luci/sixsixsix/powerampache2/common/Constants.kt

@@ -39,9 +39,8 @@ object Constants {
  const val DATABASE_LIMIT_ELEMENTS = 66
  const val QUICK_PLAY_MIN_SONGS = 50
  const val USER_ACCESS_DEFAULT = 25
- const val USER_EMAIL_DEFAULT = "" //""[email protected]"
+ const val USER_EMAIL_DEFAULT = ""
  const val USER_FULL_NAME_PUBLIC_DEFAULT = 0
- const val PLAYLIST_FETCH_LIMIT = 50
  const val NETWORK_REQUEST_LIMIT_ARTISTS = 30
  const val NETWORK_REQUEST_LIMIT_SONGS = 40
  const val NETWORK_REQUEST_LIMIT_SONGS_SEARCH = 100
@@ -65,7 +64,6 @@ object Constants {
  const val USER_ID_ERROR = ERROR_INT
 
  // FLAGS
- const val RESET_QUEUE_ON_NEW_SESSION = BuildConfig.RESET_QUEUE_ON_NEW_SESSION
  const val CLEAR_TABLE_AFTER_FETCH = false
  const val ALWAYS_FETCH_ALL_PLAYLISTS = true
 
@@ -92,4 +90,8 @@ object Constants {
  const val DOGMAZIC_FAKE_USERNAME = "PowerAmpache"
  const val DOGMAZIC_FAKE_STATE = "Ehime"
  const val DOGMAZIC_FAKE_CITY = "Aoshima"
+
+ // fetch this from remote config or initialize locally
+ const val CONFIG_URL = "https://icefields.github.io/powerampache/config.json"
+ var config = Pa2Config()
 }

app/src/main/java/luci/sixsixsix/powerampache2/common/Pa2Config.kt

@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2024 Antonio Tari
+ *
+ * This file is a part of Power Ampache 2
+ * Ampache Android client application
+ * @author Antonio Tari
+ *
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http:https://www.gnu.org/licenses/>.
+ *
+ */
+package luci.sixsixsix.powerampache2.common
+
+import luci.sixsixsix.powerampache2.BuildConfig
+
+const val PLAYLIST_FETCH_LIMIT = 100
+const val PLAYLIST_ADD_NEW_ENABLE = true
+const val RESET_QUEUE_ON_NEW_SESSION = BuildConfig.RESET_QUEUE_ON_NEW_SESSION
+const val DOGMAZIC_USER = BuildConfig.DOGMAZIC_USER
+
+data class Pa2Config(
+ // use new fast method for adding albums and playlists to playlist
+ val playlistAddNewEnable: Boolean = PLAYLIST_ADD_NEW_ENABLE,
+
+ // reset queue on new session
+ val queueResetOnNewSession: Boolean = RESET_QUEUE_ON_NEW_SESSION,
+
+ val dogmazicDemoUser: String = DOGMAZIC_USER,
+
+ // limit of songs to fetch for playlists
+ // - bigger number results in faster fetching
+ // - smaller number will result in data becoming visible to the user faster, but it will
+ // take longer to completely fetch big playlists
+ val playlistSongsFetchLimit: Int = PLAYLIST_FETCH_LIMIT,
+)

app/src/main/java/luci/sixsixsix/powerampache2/data/BaseAmpacheRepository.kt

@@ -63,7 +63,6 @@ abstract class BaseAmpacheRepository(
  private val errHandler: ErrorHandler
 ) {
  protected val dao = db.dao
- //protected var offlineModeEnabledLiveData = dao.offlineModeEnabled().distinctUntilChanged().map { it == true }
 
  val settingsLiveData: LiveData<LocalSettings?>
  get() = dao.settingsLiveData().distinctUntilChanged().map {
@@ -135,7 +134,6 @@ abstract class BaseAmpacheRepository(
  }
  }
 
-
  protected suspend fun cacheSongs(songs: List<Song>) {
  val credentials = getCurrentCredentials()
  dao.insertSongs(songs.map { it.toSongEntity(username = credentials.username, serverUrl = credentials.serverUrl) })
@@ -176,7 +174,6 @@ abstract class BaseAmpacheRepository(
  MainNetwork.Type.playlist -> dao.getAllPlaylists()
  .firstOrNull { it.id == id}?.copy(flag = flag)?.let { dbPlaylist ->
  dao.insertPlaylists(listOf(dbPlaylist))
- L("like inserted")
  }
  }
  if (!isOfflineModeEnabled()) {

app/src/main/java/luci/sixsixsix/powerampache2/data/MusicRepositoryImpl.kt

@@ -36,6 +36,7 @@ import kotlinx.coroutines.launch
 import luci.sixsixsix.mrlog.L
 import luci.sixsixsix.powerampache2.BuildConfig
 import luci.sixsixsix.powerampache2.common.Constants
+import luci.sixsixsix.powerampache2.common.Pa2Config
 import luci.sixsixsix.powerampache2.common.Resource
 import luci.sixsixsix.powerampache2.common.sha256
 import luci.sixsixsix.powerampache2.data.local.MusicDatabase
@@ -53,6 +54,7 @@ import luci.sixsixsix.powerampache2.data.local.multiuserDbKey
 import luci.sixsixsix.powerampache2.data.remote.MainNetwork
 import luci.sixsixsix.powerampache2.data.remote.dto.toError
 import luci.sixsixsix.powerampache2.data.remote.dto.toGenre
+import luci.sixsixsix.powerampache2.data.remote.dto.toPa2Config
 import luci.sixsixsix.powerampache2.data.remote.dto.toServerInfo
 import luci.sixsixsix.powerampache2.data.remote.dto.toSession
 import luci.sixsixsix.powerampache2.domain.MusicRepository
@@ -84,6 +86,8 @@ class MusicRepositoryImpl @Inject constructor(
 ): BaseAmpacheRepository(api, db, errorHandler), MusicRepository {
  private val _serverInfoStateFlow = MutableStateFlow(ServerInfo())
  override val serverInfoStateFlow: StateFlow<ServerInfo> = _serverInfoStateFlow
+ val serverVersionStateFlow = serverInfoStateFlow.mapNotNull { it.version }.distinctUntilChanged()
+
  override val sessionLiveData = dao.getSessionLiveData().map { it?.toSession() }
  override val userLiveData: Flow<User?> = dao.getUserLiveData().map {
  val cred = getCurrentCredentials()
@@ -94,6 +98,7 @@ class MusicRepositoryImpl @Inject constructor(
  // used to check if a call to getUserNetwork() is necessary
  private var currentAuthToken: String? = null
  private var currentUser: User? = null
+
  init {
  // Things to do when we get new or different session
  // user will itself emit a user object to observe
@@ -110,6 +115,18 @@ class MusicRepositoryImpl @Inject constructor(
  }
  }
  }
+
+ GlobalScope.launch {
+ initialize()
+ }
+ }
+
+ private suspend fun initialize() {
+ Constants.config = try {
+ api.getConfig().toPa2Config()
+ } catch (e: Exception) {
+ Pa2Config()
+ }
  }
 
  private suspend fun setSession(se: Session) {
@@ -280,17 +297,17 @@ class MusicRepositoryImpl @Inject constructor(
  return@flow
  }
 
- val auth = getSession()!!
+ val auth = authToken()
  val serverVersion = try {
  serverInfoStateFlow.value.version?.split(".")?.firstOrNull()?.let { version ->
  if (version.isDigitsOnly()) version.toInt() else Int.MAX_VALUE
  } ?: Int.MAX_VALUE
  } catch (e: Exception) { Int.MAX_VALUE } // set to max value in case of errors to force the newest api
 
  val response = if (serverVersion >= 5) {
- api.getGenres(authKey = auth.auth).genres!!.map { it.toGenre() }
+ api.getGenres(authKey = auth).genres!!.map { it.toGenre() }
  } else {
- api.getTags(authKey = auth.auth).tags!!.map { it.toGenre() }
+ api.getTags(authKey = auth).tags!!.map { it.toGenre() }
  }
 
  if (Constants.CLEAR_TABLE_AFTER_FETCH) {