From f4c98c8a6d76ba6db864d9d51195e2af584ff84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Font=C3=A1n?= Date: Thu, 27 Jun 2024 16:12:53 +0200 Subject: [PATCH] Organized the `library` module for future changes following clean architecture project structure --- .../youtubedl_android_example/App.java | 2 +- .../CommandExampleActivity.java | 2 +- .../DownloadingExampleActivity.java | 2 +- .../MainActivity.java | 10 +++--- .../StreamingExampleActivity.java | 2 +- .../main/java/com/yausername/aria2c/Aria2c.kt | 2 +- .../main/java/com/yausername/ffmpeg/FFmpeg.kt | 2 +- .../yausername/youtubedl_android/YoutubeDL.kt | 35 +++++-------------- .../{ => data/local}/YoutubeDLOptions.kt | 2 +- .../{ => data/local}/YoutubeDLRequest.kt | 2 +- .../streams}/DownloadProgressCallback.kt | 2 +- .../streams/DownloadProgressCallbackImpl.kt | 7 ++++ .../{ => data/local/streams}/StreamGobbler.kt | 3 +- .../local/streams}/StreamProcessExtractor.kt | 3 +- .../{ => data/remote}/YoutubeDLUpdater.kt | 11 +++--- .../youtubedl_android/domain/UpdateChannel.kt | 23 ++++++++++++ .../youtubedl_android/domain/UpdateStatus.kt | 5 +++ .../{ => domain}/YoutubeDLException.kt | 2 +- .../{ => domain/model}/YoutubeDLResponse.kt | 2 +- .../model/videos}/VideoFormat.kt | 2 +- .../model/videos}/VideoInfo.kt | 2 +- .../model/videos}/VideoSubtitle.kt | 2 +- .../model/videos}/VideoThumbnail.kt | 2 +- 23 files changed, 74 insertions(+), 53 deletions(-) rename library/src/main/java/com/yausername/youtubedl_android/{ => data/local}/YoutubeDLOptions.kt (97%) rename library/src/main/java/com/yausername/youtubedl_android/{ => data/local}/YoutubeDLRequest.kt (96%) rename library/src/main/java/com/yausername/youtubedl_android/{ => data/local/streams}/DownloadProgressCallback.kt (65%) create mode 100644 library/src/main/java/com/yausername/youtubedl_android/data/local/streams/DownloadProgressCallbackImpl.kt rename library/src/main/java/com/yausername/youtubedl_android/{ => data/local/streams}/StreamGobbler.kt (87%) rename library/src/main/java/com/yausername/youtubedl_android/{ => data/local/streams}/StreamProcessExtractor.kt (96%) rename library/src/main/java/com/yausername/youtubedl_android/{ => data/remote}/YoutubeDLUpdater.kt (92%) create mode 100644 library/src/main/java/com/yausername/youtubedl_android/domain/UpdateChannel.kt create mode 100644 library/src/main/java/com/yausername/youtubedl_android/domain/UpdateStatus.kt rename library/src/main/java/com/yausername/youtubedl_android/{ => domain}/YoutubeDLException.kt (81%) rename library/src/main/java/com/yausername/youtubedl_android/{ => domain/model}/YoutubeDLResponse.kt (73%) rename library/src/main/java/com/yausername/youtubedl_android/{mapper => domain/model/videos}/VideoFormat.kt (93%) rename library/src/main/java/com/yausername/youtubedl_android/{mapper => domain/model/videos}/VideoInfo.kt (97%) rename library/src/main/java/com/yausername/youtubedl_android/{mapper => domain/model/videos}/VideoSubtitle.kt (67%) rename library/src/main/java/com/yausername/youtubedl_android/{mapper => domain/model/videos}/VideoThumbnail.kt (75%) diff --git a/app/src/main/java/com/yausername/youtubedl_android_example/App.java b/app/src/main/java/com/yausername/youtubedl_android_example/App.java index 1f435271..f6f978c0 100644 --- a/app/src/main/java/com/yausername/youtubedl_android_example/App.java +++ b/app/src/main/java/com/yausername/youtubedl_android_example/App.java @@ -7,7 +7,7 @@ import com.yausername.aria2c.Aria2c; import com.yausername.ffmpeg.FFmpeg; import com.yausername.youtubedl_android.YoutubeDL; -import com.yausername.youtubedl_android.YoutubeDLException; +import com.yausername.youtubedl_android.domain.YoutubeDLException; import io.reactivex.Completable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/com/yausername/youtubedl_android_example/CommandExampleActivity.java b/app/src/main/java/com/yausername/youtubedl_android_example/CommandExampleActivity.java index 60350d2c..cc882b27 100644 --- a/app/src/main/java/com/yausername/youtubedl_android_example/CommandExampleActivity.java +++ b/app/src/main/java/com/yausername/youtubedl_android_example/CommandExampleActivity.java @@ -17,7 +17,7 @@ import androidx.core.app.ActivityCompat; import com.yausername.youtubedl_android.YoutubeDL; -import com.yausername.youtubedl_android.YoutubeDLRequest; +import com.yausername.youtubedl_android.data.local.YoutubeDLRequest; import java.util.Collections; import java.util.regex.Matcher; diff --git a/app/src/main/java/com/yausername/youtubedl_android_example/DownloadingExampleActivity.java b/app/src/main/java/com/yausername/youtubedl_android_example/DownloadingExampleActivity.java index 874c0292..21a78a96 100644 --- a/app/src/main/java/com/yausername/youtubedl_android_example/DownloadingExampleActivity.java +++ b/app/src/main/java/com/yausername/youtubedl_android_example/DownloadingExampleActivity.java @@ -20,7 +20,7 @@ import androidx.core.app.ActivityCompat; import com.yausername.youtubedl_android.YoutubeDL; -import com.yausername.youtubedl_android.YoutubeDLRequest; +import com.yausername.youtubedl_android.data.local.YoutubeDLRequest; import java.io.File; diff --git a/app/src/main/java/com/yausername/youtubedl_android_example/MainActivity.java b/app/src/main/java/com/yausername/youtubedl_android_example/MainActivity.java index a162b5ec..0645b681 100644 --- a/app/src/main/java/com/yausername/youtubedl_android_example/MainActivity.java +++ b/app/src/main/java/com/yausername/youtubedl_android_example/MainActivity.java @@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity; import com.yausername.youtubedl_android.YoutubeDL; +import com.yausername.youtubedl_android.domain.UpdateChannel; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -19,7 +20,6 @@ import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; - public class MainActivity extends AppCompatActivity implements View.OnClickListener { private Button btnStreamingExample; @@ -87,11 +87,11 @@ public void onClick(View v) { .setItems(new String[]{"Stable Releases", "Nightly Releases", "Master Releases"}, (dialogInterface, which) -> { if (which == 0) - updateYoutubeDL(YoutubeDL.UpdateChannel._STABLE); + updateYoutubeDL(UpdateChannel._STABLE); else if (which == 1) - updateYoutubeDL(YoutubeDL.UpdateChannel._NIGHTLY); + updateYoutubeDL(UpdateChannel._NIGHTLY); else - updateYoutubeDL(YoutubeDL.UpdateChannel._MASTER); + updateYoutubeDL(UpdateChannel._MASTER); }) .create(); dialog.show(); @@ -100,7 +100,7 @@ else if (which == 1) } } - private void updateYoutubeDL(YoutubeDL.UpdateChannel updateChannel) { + private void updateYoutubeDL(UpdateChannel updateChannel) { if (updating) { Toast.makeText(MainActivity.this, "Update is already in progress!", Toast.LENGTH_LONG).show(); return; diff --git a/app/src/main/java/com/yausername/youtubedl_android_example/StreamingExampleActivity.java b/app/src/main/java/com/yausername/youtubedl_android_example/StreamingExampleActivity.java index ef633d78..224febb5 100644 --- a/app/src/main/java/com/yausername/youtubedl_android_example/StreamingExampleActivity.java +++ b/app/src/main/java/com/yausername/youtubedl_android_example/StreamingExampleActivity.java @@ -15,7 +15,7 @@ import com.devbrackets.android.exomedia.listener.OnPreparedListener; import com.devbrackets.android.exomedia.ui.widget.VideoView; import com.yausername.youtubedl_android.YoutubeDL; -import com.yausername.youtubedl_android.YoutubeDLRequest; +import com.yausername.youtubedl_android.data.local.YoutubeDLRequest; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/aria2c/src/main/java/com/yausername/aria2c/Aria2c.kt b/aria2c/src/main/java/com/yausername/aria2c/Aria2c.kt index 86b3fc6d..7444b21b 100644 --- a/aria2c/src/main/java/com/yausername/aria2c/Aria2c.kt +++ b/aria2c/src/main/java/com/yausername/aria2c/Aria2c.kt @@ -1,7 +1,7 @@ package com.yausername.aria2c import android.content.Context -import com.yausername.youtubedl_android.YoutubeDLException +import com.yausername.youtubedl_android.domain.YoutubeDLException import com.yausername.youtubedl_common.SharedPrefsHelper import com.yausername.youtubedl_common.utils.ZipUtils import org.apache.commons.io.FileUtils diff --git a/ffmpeg/src/main/java/com/yausername/ffmpeg/FFmpeg.kt b/ffmpeg/src/main/java/com/yausername/ffmpeg/FFmpeg.kt index 4ddf09d0..3c3369db 100644 --- a/ffmpeg/src/main/java/com/yausername/ffmpeg/FFmpeg.kt +++ b/ffmpeg/src/main/java/com/yausername/ffmpeg/FFmpeg.kt @@ -1,7 +1,7 @@ package com.yausername.ffmpeg import android.content.Context -import com.yausername.youtubedl_android.YoutubeDLException +import com.yausername.youtubedl_android.domain.YoutubeDLException import com.yausername.youtubedl_common.SharedPrefsHelper import com.yausername.youtubedl_common.SharedPrefsHelper.update import com.yausername.youtubedl_common.utils.ZipUtils.unzip diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDL.kt b/library/src/main/java/com/yausername/youtubedl_android/YoutubeDL.kt index 9593b1b6..8bd70be3 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDL.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/YoutubeDL.kt @@ -3,8 +3,15 @@ package com.yausername.youtubedl_android import android.content.Context import android.os.Build import com.fasterxml.jackson.databind.ObjectMapper -import com.yausername.youtubedl_android.YoutubeDLException -import com.yausername.youtubedl_android.mapper.VideoInfo +import com.yausername.youtubedl_android.data.local.YoutubeDLRequest +import com.yausername.youtubedl_android.data.local.streams.StreamGobbler +import com.yausername.youtubedl_android.data.local.streams.StreamProcessExtractor +import com.yausername.youtubedl_android.data.remote.YoutubeDLUpdater +import com.yausername.youtubedl_android.domain.UpdateChannel +import com.yausername.youtubedl_android.domain.UpdateStatus +import com.yausername.youtubedl_android.domain.YoutubeDLException +import com.yausername.youtubedl_android.domain.model.YoutubeDLResponse +import com.yausername.youtubedl_android.domain.model.videos.VideoInfo import com.yausername.youtubedl_common.SharedPrefsHelper import com.yausername.youtubedl_common.SharedPrefsHelper.update import com.yausername.youtubedl_common.utils.ZipUtils.unzip @@ -243,30 +250,6 @@ object YoutubeDL { return YoutubeDLUpdater.versionName(appContext) } - enum class UpdateStatus { - DONE, ALREADY_UP_TO_DATE - } - - open class UpdateChannel(val apiUrl: String) { - object STABLE : UpdateChannel("https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest") - object NIGHTLY : - UpdateChannel("https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest") - - object MASTER : - UpdateChannel("https://api.github.com/repos/yt-dlp/yt-dlp-master-builds/releases/latest") - - companion object { - @JvmField - val _STABLE: STABLE = STABLE - - @JvmField - val _NIGHTLY: NIGHTLY = NIGHTLY - - @JvmField - val _MASTER: MASTER = MASTER - } - } - const val baseName = "youtubedl-android" private const val packagesRoot = "packages" diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLOptions.kt b/library/src/main/java/com/yausername/youtubedl_android/data/local/YoutubeDLOptions.kt similarity index 97% rename from library/src/main/java/com/yausername/youtubedl_android/YoutubeDLOptions.kt rename to library/src/main/java/com/yausername/youtubedl_android/data/local/YoutubeDLOptions.kt index c0ec28b2..298139d7 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLOptions.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/data/local/YoutubeDLOptions.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.data.local import kotlin.collections.ArrayList import kotlin.collections.LinkedHashMap diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLRequest.kt b/library/src/main/java/com/yausername/youtubedl_android/data/local/YoutubeDLRequest.kt similarity index 96% rename from library/src/main/java/com/yausername/youtubedl_android/YoutubeDLRequest.kt rename to library/src/main/java/com/yausername/youtubedl_android/data/local/YoutubeDLRequest.kt index dc813557..835dfb92 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLRequest.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/data/local/YoutubeDLRequest.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.data.local class YoutubeDLRequest { private val urls: List diff --git a/library/src/main/java/com/yausername/youtubedl_android/DownloadProgressCallback.kt b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/DownloadProgressCallback.kt similarity index 65% rename from library/src/main/java/com/yausername/youtubedl_android/DownloadProgressCallback.kt rename to library/src/main/java/com/yausername/youtubedl_android/data/local/streams/DownloadProgressCallback.kt index 040d23f0..da7f061c 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/DownloadProgressCallback.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/DownloadProgressCallback.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.data.local.streams interface DownloadProgressCallback { fun onProgressUpdate(progress: Float, etaInSeconds: Long, line: String?) diff --git a/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/DownloadProgressCallbackImpl.kt b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/DownloadProgressCallbackImpl.kt new file mode 100644 index 00000000..fcf4c484 --- /dev/null +++ b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/DownloadProgressCallbackImpl.kt @@ -0,0 +1,7 @@ +package com.yausername.youtubedl_android.data.local.streams + +class DownloadProgressCallbackImpl : DownloadProgressCallback { + override fun onProgressUpdate(progress: Float, etaInSeconds: Long, line: String?) { + TODO("Not yet implemented") + } +} \ No newline at end of file diff --git a/library/src/main/java/com/yausername/youtubedl_android/StreamGobbler.kt b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/StreamGobbler.kt similarity index 87% rename from library/src/main/java/com/yausername/youtubedl_android/StreamGobbler.kt rename to library/src/main/java/com/yausername/youtubedl_android/data/local/streams/StreamGobbler.kt index 074e8d2f..e6988366 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/StreamGobbler.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/StreamGobbler.kt @@ -1,6 +1,7 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.data.local.streams import android.util.Log +import com.yausername.youtubedl_android.BuildConfig import java.io.IOException import java.io.InputStream import java.io.InputStreamReader diff --git a/library/src/main/java/com/yausername/youtubedl_android/StreamProcessExtractor.kt b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/StreamProcessExtractor.kt similarity index 96% rename from library/src/main/java/com/yausername/youtubedl_android/StreamProcessExtractor.kt rename to library/src/main/java/com/yausername/youtubedl_android/data/local/streams/StreamProcessExtractor.kt index 4eb39376..62a54a85 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/StreamProcessExtractor.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/data/local/streams/StreamProcessExtractor.kt @@ -1,6 +1,7 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.data.local.streams import android.util.Log +import com.yausername.youtubedl_android.BuildConfig import java.io.IOException import java.io.InputStream import java.io.InputStreamReader diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLUpdater.kt b/library/src/main/java/com/yausername/youtubedl_android/data/remote/YoutubeDLUpdater.kt similarity index 92% rename from library/src/main/java/com/yausername/youtubedl_android/YoutubeDLUpdater.kt rename to library/src/main/java/com/yausername/youtubedl_android/data/remote/YoutubeDLUpdater.kt index 76728458..3c5a1c9b 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLUpdater.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/data/remote/YoutubeDLUpdater.kt @@ -1,11 +1,12 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.data.remote import android.content.Context import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.ArrayNode -import com.yausername.youtubedl_android.YoutubeDL.UpdateChannel -import com.yausername.youtubedl_android.YoutubeDL.UpdateStatus -import com.yausername.youtubedl_android.YoutubeDL.getInstance +import com.yausername.youtubedl_android.YoutubeDL +import com.yausername.youtubedl_android.domain.UpdateChannel +import com.yausername.youtubedl_android.domain.UpdateStatus +import com.yausername.youtubedl_android.domain.YoutubeDLException import com.yausername.youtubedl_common.SharedPrefsHelper import com.yausername.youtubedl_common.SharedPrefsHelper.update import org.apache.commons.io.FileUtils @@ -45,7 +46,7 @@ internal object YoutubeDLUpdater { } catch (e: Exception) { /* if something went wrong restore default version */ FileUtils.deleteQuietly(ytdlpDir) - getInstance().init_ytdlp(appContext, ytdlpDir) + YoutubeDL.init_ytdlp(appContext, ytdlpDir) throw YoutubeDLException(e) } finally { file.delete() diff --git a/library/src/main/java/com/yausername/youtubedl_android/domain/UpdateChannel.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/UpdateChannel.kt new file mode 100644 index 00000000..223156be --- /dev/null +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/UpdateChannel.kt @@ -0,0 +1,23 @@ +package com.yausername.youtubedl_android.domain + +open class UpdateChannel(val apiUrl: String) { + object STABLE : + UpdateChannel("https://api.github.com/repos/yt-dlp/yt-dlp/releases/latest") + + object NIGHTLY : + UpdateChannel("https://api.github.com/repos/yt-dlp/yt-dlp-nightly-builds/releases/latest") + + object MASTER : + UpdateChannel("https://api.github.com/repos/yt-dlp/yt-dlp-master-builds/releases/latest") + + companion object { + @JvmField + val _STABLE: STABLE = STABLE + + @JvmField + val _NIGHTLY: NIGHTLY = NIGHTLY + + @JvmField + val _MASTER: MASTER = MASTER + } +} \ No newline at end of file diff --git a/library/src/main/java/com/yausername/youtubedl_android/domain/UpdateStatus.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/UpdateStatus.kt new file mode 100644 index 00000000..078900cf --- /dev/null +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/UpdateStatus.kt @@ -0,0 +1,5 @@ +package com.yausername.youtubedl_android.domain + +enum class UpdateStatus { + DONE, ALREADY_UP_TO_DATE +} \ No newline at end of file diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLException.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/YoutubeDLException.kt similarity index 81% rename from library/src/main/java/com/yausername/youtubedl_android/YoutubeDLException.kt rename to library/src/main/java/com/yausername/youtubedl_android/domain/YoutubeDLException.kt index ef44945b..1fdc40b8 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLException.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/YoutubeDLException.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.domain class YoutubeDLException : Exception { constructor(message: String?) : super(message) {} diff --git a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLResponse.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/model/YoutubeDLResponse.kt similarity index 73% rename from library/src/main/java/com/yausername/youtubedl_android/YoutubeDLResponse.kt rename to library/src/main/java/com/yausername/youtubedl_android/domain/model/YoutubeDLResponse.kt index 49fd8ddc..6976d7f8 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/YoutubeDLResponse.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/model/YoutubeDLResponse.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android +package com.yausername.youtubedl_android.domain.model class YoutubeDLResponse( val command: List, diff --git a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoFormat.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoFormat.kt similarity index 93% rename from library/src/main/java/com/yausername/youtubedl_android/mapper/VideoFormat.kt rename to library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoFormat.kt index e7d8fc5d..8809aaf0 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoFormat.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoFormat.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android.mapper +package com.yausername.youtubedl_android.domain.model.videos import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty diff --git a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoInfo.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoInfo.kt similarity index 97% rename from library/src/main/java/com/yausername/youtubedl_android/mapper/VideoInfo.kt rename to library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoInfo.kt index 80d18470..e2d277a1 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoInfo.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoInfo.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android.mapper +package com.yausername.youtubedl_android.domain.model.videos import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty diff --git a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoSubtitle.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoSubtitle.kt similarity index 67% rename from library/src/main/java/com/yausername/youtubedl_android/mapper/VideoSubtitle.kt rename to library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoSubtitle.kt index 5685525c..4e2a1ea2 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoSubtitle.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoSubtitle.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android.mapper +package com.yausername.youtubedl_android.domain.model.videos import com.fasterxml.jackson.annotation.JsonIgnoreProperties diff --git a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoThumbnail.kt b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoThumbnail.kt similarity index 75% rename from library/src/main/java/com/yausername/youtubedl_android/mapper/VideoThumbnail.kt rename to library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoThumbnail.kt index d919a39c..58d35680 100644 --- a/library/src/main/java/com/yausername/youtubedl_android/mapper/VideoThumbnail.kt +++ b/library/src/main/java/com/yausername/youtubedl_android/domain/model/videos/VideoThumbnail.kt @@ -1,4 +1,4 @@ -package com.yausername.youtubedl_android.mapper +package com.yausername.youtubedl_android.domain.model.videos import com.fasterxml.jackson.annotation.JsonIgnoreProperties