danvics/ytdlnis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
zaednasr 2024-02-04 18:11:00 +01:00
parent 9b2e3fd128
commit c093bbd98c
No known key found for this signature in database
GPG key ID: 92B1DE23AD3D0E9E
10 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ObserveSourcesViewModel.kt
View file

@ -63,10 +63,15 @@ class ObserveSourcesViewModel(private val application: Application) : AndroidVie
}
fun delete(item: ObserveSourcesItem) = viewModelScope.launch(Dispatchers.IO) {
runCatching { DownloadUtil.cancelObservationTaskByID(application, item.id) }
repository.delete(item)
}
fun deleteAll() = viewModelScope.launch(Dispatchers.IO) {
getAll().forEach {
runCatching { DownloadUtil.cancelObservationTaskByID(application, it.id) }
}
repository.deleteAll()
}

8
app/src/main/java/com/deniscerri/ytdlnis/work/ObserveSourceWorker.kt
View file

@ -83,6 +83,11 @@ class ObserveSourceWorker(
items.add(downloadItem)
}
withContext(Dispatchers.IO){
repo.update(item)
}
if (items.isNotEmpty()){
//QUEUE DOWNLOADS
@ -149,7 +154,7 @@ class ObserveSourceWorker(
DownloadUtil.startDownloadWorker(queuedItems, context)
if(!useScheduler){
queuedItems.filter { it.downloadStartTime != 0L && (it.title.isEmpty() || it.author.isEmpty() || it.thumb.isEmpty()) }.forEach {
queuedItems.filter { it.downloadStartTime != 0L || (it.title.isEmpty() || it.author.isEmpty() || it.thumb.isEmpty()) }.forEach {
try{
updateDownloadItem(it, infoUtil, downloadRepo, dbManager.resultDao)
}catch (ignored: Exception){}
@ -166,7 +171,6 @@ class ObserveSourceWorker(
item.alreadyProcessedLinks.addAll(items.map { it.url })
}
if (item.runCount > item.endsAfterCount && item.endsAfterCount > 0){
item.status = ObserveSourcesRepository.SourceStatus.STOPPED
withContext(Dispatchers.IO){

20
app/src/main/res/layout/observe_sources_bottom_sheet.xml
View file

@ -394,20 +394,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:weightSum="5"
android:orientation="horizontal">
<RadioButton
android:id="@+id/on"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/on"
android:text="@string/on_time"
android:layout_weight="2"
android:paddingHorizontal="10dp" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/on_date"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:hintEnabled="false"
android:layout_weight="3"
android:layout_marginStart="15dp"
style="@style/Widget.Material3.TextInputLayout.FilledBox">
@ -425,18 +428,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="7"
android:orientation="horizontal">
<RadioButton
android:id="@+id/after"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="3"
android:layout_height="wrap_content"
android:layout_marginEnd="-4dp"
android:text="@string/after"
android:paddingHorizontal="10dp" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/after_nr"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
style="@style/Widget.Material3.TextInputLayout.FilledBox.Dense">
@ -452,7 +459,8 @@
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="2"
android:layout_height="wrap_content"
android:paddingHorizontal="10dp"
android:text="@string/occurrences"/>

2
app/src/main/res/values-in/strings.xml
View file

@ -334,7 +334,7 @@
<string name="starts">Mulai</string>
<string name="ends">Berakhir</string>
<string name="never">Jangan pernah</string>
<string name="on">Pada</string>
<string name="on_time">Pada</string>
<string name="after">Setelah</string>
<string name="occurrences">kali</string>
<string name="week">Pekan</string>

2
app/src/main/res/values-pt-rBR/strings.xml
View file

@ -342,7 +342,7 @@
<string name="ends">Termina</string>
<string name="never">Nunca</string>
<string name="after">Depois</string>
<string name="on">Habilitar</string>
<string name="on_time">Habilitar</string>
<string name="week">Semana</string>
<string name="month">Mês</string>
<string name="bitrate">Taxa de bits</string>

2
app/src/main/res/values-pt/strings.xml
View file

@ -356,7 +356,7 @@
<string name="day">Dia</string>
<string name="month">Mês</string>
<string name="set_time">Definir tempo</string>
<string name="on">Ligado</string>
<string name="on_time">Ligado</string>
<string name="download_archive">Arquivo de descarga</string>
<string name="download_archive_summary">Use o arquivo de descarga do yt-dlp para evitar descargas duplicados em vez da funcionalidade integrada</string>
</resources>

2
app/src/main/res/values-ru/strings.xml
View file

@ -343,7 +343,7 @@
<string name="set_time">Установить время</string>
<string name="never">Никогда</string>
<string name="starts">Начинается</string>
<string name="on">Вкл</string>
<string name="on_time">Вкл</string>
<string name="day">День</string>
<string name="occurrences">случаи</string>
<string name="download_archive_summary">Используйте архивный файл загрузок yt-dlp, чтобы предотвратить дублирование загрузок вместо встроенной функции</string>

2
app/src/main/res/values-sq-rAL/strings.xml
View file

@ -340,7 +340,7 @@
<string name="copy_urls">Kopjo URL\'të</string>
<string name="starts">Fillon</string>
<string name="never">Kurrë</string>
<string name="on">Në</string>
<string name="on_time">Në</string>
<string name="after">Pas</string>
<string name="occurrences">herësh</string>
<string name="week">Javë</string>

2
app/src/main/res/values-uk/strings.xml
View file

@ -343,7 +343,7 @@
<string name="set_time">Встановити час</string>
<string name="ends">Закінчується</string>
<string name="never">Ніколи</string>
<string name="on">Вкл</string>
<string name="on_time">Вкл</string>
<string name="after">Після</string>
<string name="day">День</string>
<string name="week">Тиждень</string>

2
app/src/main/res/values/strings.xml
View file

@ -350,7 +350,7 @@
<string name="starts">Starts</string>
<string name="ends">Ends</string>
<string name="never">Never</string>
<string name="on">On</string>
<string name="on_time">On</string>
<string name="after">After</string>
<string name="occurrences">occurrences</string>
<string name="day">Day</string>