From 5359c819bd31164f6300b86f7c2f7ae8da9ee06b Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sun, 9 Jan 2022 18:59:26 -0700 Subject: [PATCH] prebuild: reformat Reformat the prebuild file, which apparently decided to format themselves with indents instead of spaces. Fun. --- .../org/oxycblt/auxio/coil/AuxioFetcher.kt | 2 +- .../auxio/playback/system/AudioReactor.kt | 2 +- prebuild.py | 64 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt b/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt index 6c2bcf791..fe8c853b0 100644 --- a/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt +++ b/app/src/main/java/org/oxycblt/auxio/coil/AuxioFetcher.kt @@ -19,7 +19,7 @@ import com.google.android.exoplayer2.MediaItem import com.google.android.exoplayer2.MediaMetadata import com.google.android.exoplayer2.MetadataRetriever import com.google.android.exoplayer2.metadata.id3.ApicFrame -import com.google.android.exoplayer2.metadata.xiph.PictureFrame +import com.google.android.exoplayer2.metadata.vorbis.PictureFrame import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import okio.buffer diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt index c7a81d6a9..99fabac36 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt @@ -26,7 +26,7 @@ import androidx.media.AudioFocusRequestCompat import androidx.media.AudioManagerCompat import com.google.android.exoplayer2.metadata.Metadata import com.google.android.exoplayer2.metadata.id3.TextInformationFrame -import com.google.android.exoplayer2.metadata.xiph.VorbisComment +import com.google.android.exoplayer2.metadata.vorbis.VorbisComment import org.oxycblt.auxio.playback.state.PlaybackStateManager import org.oxycblt.auxio.settings.SettingsManager import org.oxycblt.auxio.util.getSystemServiceSafe diff --git a/prebuild.py b/prebuild.py index ab3e1b2aa..2e0ef6401 100755 --- a/prebuild.py +++ b/prebuild.py @@ -20,53 +20,53 @@ system = platform.system() # We do some shell scripting later on, so we can't support windows. if system not in ["Linux", "Darwin"]: - print("fatal: unsupported platform " + system) - sys.exit(1) + print("fatal: unsupported platform " + system) + sys.exit(1) def sh(cmd): - code = subprocess.call(["sh", "-c", "set -e; " + cmd]) + code = subprocess.call(["sh", "-c", "set -e; " + cmd]) - if code != 0: - print(FATAL + "fatal:" + NC + " command failed with exit code " + str(code)) - sys.exit(1) - + if code != 0: + print(FATAL + "fatal:" + NC + " command failed with exit code " + str(code)) + sys.exit(1) + exoplayer_path = os.path.join(os.path.abspath(os.curdir), "deps", "exoplayer") if os.path.exists(exoplayer_path): - reinstall = input(INFO + "info:" + NC + " ExoPlayer is already installed. Would you like to reinstall it? [y/n] ") + reinstall = input(INFO + "info:" + NC + " ExoPlayer is already installed. Would you like to reinstall it? [y/n] ") - if not re.match("[yY][eE][sS]|[yY]", reinstall): - sys.exit(0) + if not re.match("[yY][eE][sS]|[yY]", reinstall): + sys.exit(0) ndk_path = os.getenv("NDK_PATH") if ndk_path is None or not os.path.isfile(os.path.join(ndk_path, "ndk_build")): - # We don't have a proper path. Do some digging on the Android SDK directory - # to see if we can find it. - if system == "Linux": - ndk_root = os.path.join(os.getenv("HOME"), "Android", "Sdk", "ndk") - elif system == "Darwin": - ndk_root = os.path.join(os.getenv("HOME"), "Library", "Android", "sdk", "ndk") + # We don't have a proper path. Do some digging on the Android SDK directory + # to see if we can find it. + if system == "Linux": + ndk_root = os.path.join(os.getenv("HOME"), "Android", "Sdk", "ndk") + elif system == "Darwin": + ndk_root = os.path.join(os.getenv("HOME"), "Library", "Android", "sdk", "ndk") - candidates = [] + candidates = [] - for entry in os.scandir(ndk_root): - if entry.is_dir(): - candidates.append(entry.path) + for entry in os.scandir(ndk_root): + if entry.is_dir(): + candidates.append(entry.path) - if len(candidates) > 0: - print(WARN + "warn:" + NC + " NDK_PATH was not set or invalid. Multiple candidates were found however:") + if len(candidates) > 0: + print(WARN + "warn:" + NC + " NDK_PATH was not set or invalid. Multiple candidates were found however:") - for i, candidate in enumerate(candidates): - print("[" + str(i) + "] " + candidate) + for i, candidate in enumerate(candidates): + print("[" + str(i) + "] " + candidate) - try: - ndk_path = candidates[int(input("Enter the NDK to use [Default 0]: "))] - except: - ndk_path = candidates[0] - else: - print(FATAL + "fatal:" + NC + " NDK_PATH is either invalid, or the Android NDK was not installed at a recognized location.") - system.exit(1) + try: + ndk_path = candidates[int(input("Enter the NDK to use [Default 0]: "))] + except: + ndk_path = candidates[0] + else: + print(FATAL + "fatal:" + NC + " NDK_PATH is either invalid, or the Android NDK was not installed at a recognized location.") + system.exit(1) # Now try to install ExoPlayer. sh("rm -rf deps") @@ -82,4 +82,4 @@ os.chdir(flac_ext_jni_path) sh('curl "https://ftp.osuosl.org/pub/xiph/releases/flac/flac-' + FLAC_VERSION + '.tar.xz" | tar xJ && mv "flac-' + FLAC_VERSION + '" flac') sh(ndk_path + "/ndk-build APP_ABI=all -j4") -print(OK + "Prebuild successful." + NC) +print(OK + "success:" + NC + " Completed pre-build.")