Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Warn of potential duplicates when adding to library #691

Merged
merged 17 commits into from
Oct 26, 2023
Merged

Warn of potential duplicates when adding to library #691

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
194f1b4
Warn possible duplicates for favorites and subscriptions
Luna712 Oct 14, 2023
67c1ac3
Add option to replace current entry
Luna712 Oct 14, 2023
e1f833a
Also support bookmarks
Luna712 Oct 14, 2023
15ef933
Check year also to have more accuracy
Luna712 Oct 15, 2023
c444a2f
Bump NiceHttp as it's causing issues
Luna712 Oct 15, 2023
fc168c0
Redo how alert dialog and callbacks are done, update messages, and su…
Luna712 Oct 16, 2023
4f91641
Add some string normalization to cover an edge case and rename callbacks
Luna712 Oct 16, 2023
61439eb
Implement IMDb duplicate title checking support
Luna712 Oct 17, 2023
7e4cc17
Merge branch 'master' into warn-duplicates
Luna712 Oct 17, 2023
01ce260
Cleanup
Luna712 Oct 17, 2023
d77cc8f
Support multiple duplicates, cleanup, and other fixes
Luna712 Oct 23, 2023
1335a32
Store all syncData instead of only imdbId to make more extendable in …
Luna712 Oct 23, 2023
ad836a6
Include apiName in dialog message to make more clear the duplicates i…
Luna712 Oct 23, 2023
14ee494
Add more checks
Luna712 Oct 23, 2023
623141c
Cleanup
Luna712 Oct 24, 2023
e1141c3
Remove return value for toggleSubscriptionStatus as well
Luna712 Oct 24, 2023
8694a13
Make duplicate warning if changed to any bookmarks from NONE
Luna712 Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,6 +1246,12 @@ interface LoadResponse {
return this.syncData[aniListIdPrefix]
}

fun LoadResponse.getImdbId(): String? {
return normalSafeApiCall {
SimklApi.readIdFromString(this.syncData[simklIdPrefix])?.get(SimklApi.Companion.SyncServices.Imdb)
}
}

fun LoadResponse.addMalId(id: Int?) {
this.syncData[malIdPrefix] = (id ?: return).toString()
this.addSimklId(SimklApi.Companion.SyncServices.Mal, id.toString())
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
this@MainActivity.getString(R.string.action_add_to_bookmarks),
showApply = false,
{}) {
viewModel.updateWatchStatus(WatchType.values()[it])
viewModel.updateWatchStatus(WatchType.values()[it], this@MainActivity)
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
}

/** Read the id string to get all other ids */
private fun readIdFromString(idString: String?): Map<SyncServices, String> {
fun readIdFromString(idString: String?): Map<SyncServices, String> {
return tryParseJson(idString) ?: return emptyMap()
}

Expand Down
32 changes: 18 additions & 14 deletions app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,21 +355,25 @@ class HomeParentItemAdapterPreview(
showApply = false,
{}) {
val newValue = WatchType.values()[it]
homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds(
null,
ContextCompat.getDrawable(
homePreviewBookmark.context,
newValue.iconRes
),
null,
null
)
homePreviewBookmark.setText(newValue.stringRes)

ResultViewModel2.updateWatchStatus(
item,
newValue
)
ResultViewModel2().updateWatchStatus(
newValue,
fab.context,
item
) { statusChanged: Boolean ->
if (!statusChanged) return@updateWatchStatus

homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds(
null,
ContextCompat.getDrawable(
homePreviewBookmark.context,
newValue.iconRes
),
null,
null
)
homePreviewBookmark.setText(newValue.stringRes)
}
}
}
}
Expand Down
48 changes: 25 additions & 23 deletions app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,34 +430,36 @@ open class ResultFragmentPhone : FullScreenPlayer() {
}
})
resultSubscribe.setOnClickListener {
val isSubscribed =
viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener
viewModel.toggleSubscriptionStatus(context) { newStatus: Boolean? ->
if (newStatus == null) return@toggleSubscriptionStatus

val message = if (isSubscribed) {
// Kinda icky to have this here, but it works.
SubscriptionWorkManager.enqueuePeriodicWork(context)
R.string.subscription_new
} else {
R.string.subscription_deleted
}
val message = if (newStatus) {
// Kinda icky to have this here, but it works.
SubscriptionWorkManager.enqueuePeriodicWork(context)
R.string.subscription_new
} else {
R.string.subscription_deleted
}

val name = (viewModel.page.value as? Resource.Success)?.value?.title
?: txt(R.string.no_data).asStringNull(context) ?: ""
CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
val name = (viewModel.page.value as? Resource.Success)?.value?.title
?: txt(R.string.no_data).asStringNull(context) ?: ""
CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
}
}
resultFavorite.setOnClickListener {
val isFavorite =
viewModel.toggleFavoriteStatus() ?: return@setOnClickListener
viewModel.toggleFavoriteStatus(context) { newStatus: Boolean? ->
if (newStatus == null) return@toggleFavoriteStatus

val message = if (isFavorite) {
R.string.favorite_added
} else {
R.string.favorite_removed
}
val message = if (newStatus) {
R.string.favorite_added
} else {
R.string.favorite_removed
}

val name = (viewModel.page.value as? Resource.Success)?.value?.title
?: txt(R.string.no_data).asStringNull(context) ?: ""
CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
val name = (viewModel.page.value as? Resource.Success)?.value?.title
?: txt(R.string.no_data).asStringNull(context) ?: ""
CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
}
}
mediaRouteButton.apply {
val chromecastSupport = api?.hasChromecastSupport == true
Expand Down Expand Up @@ -966,7 +968,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
fab.context.getString(R.string.action_add_to_bookmarks),
showApply = false,
{}) {
viewModel.updateWatchStatus(WatchType.values()[it])
viewModel.updateWatchStatus(WatchType.values()[it], context)
}
}
}
Expand Down
22 changes: 12 additions & 10 deletions app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ class ResultFragmentTv : Fragment() {
view.context.getString(R.string.action_add_to_bookmarks),
showApply = false,
{}) {
viewModel.updateWatchStatus(WatchType.values()[it])
viewModel.updateWatchStatus(WatchType.values()[it], context)
}
}
}
Expand All @@ -557,17 +557,19 @@ class ResultFragmentTv : Fragment() {
setIconResource(drawable)
setText(text)
setOnClickListener {
val isFavorite = viewModel.toggleFavoriteStatus() ?: return@setOnClickListener
viewModel.toggleFavoriteStatus(context) { newStatus: Boolean? ->
if (newStatus == null) return@toggleFavoriteStatus

val message = if (isFavorite) {
R.string.favorite_added
} else {
R.string.favorite_removed
}
val message = if (newStatus) {
R.string.favorite_added
} else {
R.string.favorite_removed
}

val name = (viewModel.page.value as? Resource.Success)?.value?.title
?: txt(R.string.no_data).asStringNull(context) ?: ""
CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
val name = (viewModel.page.value as? Resource.Success)?.value?.title
?: txt(R.string.no_data).asStringNull(context) ?: ""
CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT)
}
}
}
}
Expand Down
Loading
Loading