From 6e96c5ee994ff270f4dc95f6d54b0d0b9d2c40ff Mon Sep 17 00:00:00 2001
From: Marek <gitlab@marha.de>
Date: Sun, 5 Apr 2026 15:38:01 +0200
Subject: [PATCH] update

---
 .../youtubeapp/data/LocalStorageService.kt    |  37 ++++++++++
 .../main/java/com/youtubeapp/data/Video.kt    |   3 +-
 .../youtubeapp/ui/navigation/AppNavigation.kt |   3 +
 .../ui/screens/VideoDetailScreen.kt           |  50 +++++++++----
 .../ui/screens/VideoPlayerScreen.kt           |   4 +-
 .../youtubeapp/ui/viewmodel/VideoViewModel.kt |  67 +++++++++++++++---
 backend/models.py                             |   5 +-
 .../routes/__pycache__/videos.cpython-312.pyc | Bin 5552 -> 5590 bytes
 backend/routes/videos.py                      |   3 +-
 backend/schemas.py                            |   4 --
 .../download_service.cpython-312.pyc          | Bin 2454 -> 977 bytes
 backend/services/download_service.py          |  31 --------
 backend/services/stream_service.py            |  32 +++++++++
 13 files changed, 174 insertions(+), 65 deletions(-)
 create mode 100644 app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt
 create mode 100644 backend/services/stream_service.py

diff --git a/app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt b/app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt
new file mode 100644
index 0000000..88c3d05
--- /dev/null
+++ b/app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt
@@ -0,0 +1,37 @@
+package com.youtubeapp.data
+
+import android.content.Context
+import java.io.File
+import java.io.FileOutputStream
+import java.net.URL
+
+class LocalStorageService(private val context: Context) {
+
+    private fun videosDir(): File {
+        val dir = File(context.filesDir, "videos")
+        if (!dir.exists()) dir.mkdirs()
+        return dir
+    }
+
+    private fun videoFile(videoId: Int): File = File(videosDir(), "$videoId.mp4")
+
+    fun isLocallyAvailable(videoId: Int): Boolean = videoFile(videoId).exists()
+
+    fun getLocalFile(videoId: Int): File? {
+        val file = videoFile(videoId)
+        return if (file.exists()) file else null
+    }
+
+    fun deleteLocalFile(videoId: Int): Boolean = videoFile(videoId).delete()
+
+    fun downloadAndSave(videoId: Int): File {
+        val url = "${ApiClient.BASE_URL}videos/$videoId/file"
+        val file = videoFile(videoId)
+        URL(url).openStream().use { input ->
+            FileOutputStream(file).use { output ->
+                input.copyTo(output)
+            }
+        }
+        return file
+    }
+}
diff --git a/app/frontend/src/main/java/com/youtubeapp/data/Video.kt b/app/frontend/src/main/java/com/youtubeapp/data/Video.kt
index d4c6d78..ed2f442 100644
--- a/app/frontend/src/main/java/com/youtubeapp/data/Video.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/data/Video.kt
@@ -6,6 +6,5 @@ data class Video(
     val youtuber: String,
     val thumbnail_url: String,
     val youtube_url: String,
-    val is_downloaded: Boolean,
-    val created_at: String
+    val is_downloaded: Boolean
 )
diff --git a/app/frontend/src/main/java/com/youtubeapp/ui/navigation/AppNavigation.kt b/app/frontend/src/main/java/com/youtubeapp/ui/navigation/AppNavigation.kt
index e9ab6e1..93dcf99 100644
--- a/app/frontend/src/main/java/com/youtubeapp/ui/navigation/AppNavigation.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/ui/navigation/AppNavigation.kt
@@ -12,6 +12,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavType
@@ -30,6 +31,8 @@ import com.youtubeapp.ui.viewmodel.VideoViewModel
 fun AppNavigation() {
     val navController = rememberNavController()
     val viewModel: VideoViewModel = viewModel()
+    val context = LocalContext.current
+    viewModel.init(context)
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentRoute = navBackStackEntry?.destination?.route
 
diff --git a/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoDetailScreen.kt b/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoDetailScreen.kt
index 923c46f..256f535 100644
--- a/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoDetailScreen.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoDetailScreen.kt
@@ -11,9 +11,11 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -45,16 +47,12 @@ fun VideoDetailScreen(
 ) {
     val state by viewModel.state.collectAsState()
     val video = viewModel.getVideoById(videoId)
+    val isLocal = viewModel.isLocallyAvailable(videoId)
     val snackbarHostState = remember { SnackbarHostState() }
 
     LaunchedEffect(state.downloadStatus) {
         state.downloadStatus?.let { status ->
-            val message = when (status) {
-                "download_started" -> "Download gestartet"
-                "already_downloaded" -> "Bereits heruntergeladen"
-                else -> status
-            }
-            snackbarHostState.showSnackbar(message)
+            snackbarHostState.showSnackbar(status)
             viewModel.clearDownloadStatus()
         }
     }
@@ -101,7 +99,11 @@ fun VideoDetailScreen(
                     )
                     Spacer(modifier = Modifier.height(4.dp))
                     Text(
-                        text = if (video.is_downloaded) "Auf Server heruntergeladen" else "Noch nicht heruntergeladen",
+                        text = when {
+                            isLocal -> "Lokal gespeichert"
+                            video.is_downloaded -> "Auf Server heruntergeladen"
+                            else -> "Noch nicht heruntergeladen"
+                        },
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onSurfaceVariant
                     )
@@ -117,12 +119,34 @@ fun VideoDetailScreen(
                             Icon(Icons.Default.PlayArrow, contentDescription = null)
                             Text("  Abspielen")
                         }
-                        OutlinedButton(
-                            onClick = { viewModel.triggerDownload(videoId) },
-                            modifier = Modifier.weight(1f)
-                        ) {
-                            Icon(Icons.Default.Download, contentDescription = null)
-                            Text("  Download")
+                        if (state.isDownloading) {
+                            OutlinedButton(
+                                onClick = {},
+                                enabled = false,
+                                modifier = Modifier.weight(1f)
+                            ) {
+                                CircularProgressIndicator(
+                                    modifier = Modifier.height(20.dp),
+                                    strokeWidth = 2.dp
+                                )
+                                Text("  Download...")
+                            }
+                        } else if (isLocal) {
+                            OutlinedButton(
+                                onClick = { viewModel.deleteLocalVideo(videoId) },
+                                modifier = Modifier.weight(1f)
+                            ) {
+                                Icon(Icons.Default.Delete, contentDescription = null)
+                                Text("  Loeschen")
+                            }
+                        } else {
+                            OutlinedButton(
+                                onClick = { viewModel.triggerDownload(videoId) },
+                                modifier = Modifier.weight(1f)
+                            ) {
+                                Icon(Icons.Default.Download, contentDescription = null)
+                                Text("  Download")
+                            }
                         }
                     }
                 }
diff --git a/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoPlayerScreen.kt b/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoPlayerScreen.kt
index 4eeb09b..a3ad770 100644
--- a/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoPlayerScreen.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/ui/screens/VideoPlayerScreen.kt
@@ -20,11 +20,11 @@ import com.youtubeapp.ui.viewmodel.VideoViewModel
 @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
 fun VideoPlayerScreen(videoId: Int, viewModel: VideoViewModel) {
     val context = LocalContext.current
-    val streamUrl = viewModel.getStreamUrl(videoId)
+    val playbackUri = viewModel.getPlaybackUri(videoId)
 
     val exoPlayer = remember {
         ExoPlayer.Builder(context).build().apply {
-            setMediaItem(MediaItem.fromUri(streamUrl))
+            setMediaItem(MediaItem.fromUri(playbackUri))
             prepare()
             playWhenReady = true
         }
diff --git a/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt b/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
index ab67104..9728449 100644
--- a/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
@@ -1,9 +1,13 @@
 package com.youtubeapp.ui.viewmodel
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.youtubeapp.data.LocalStorageService
 import com.youtubeapp.data.Video
 import com.youtubeapp.data.VideoRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
@@ -12,15 +16,23 @@ data class VideoUiState(
     val allVideos: List<Video> = emptyList(),
     val downloadedVideos: List<Video> = emptyList(),
     val isLoading: Boolean = false,
+    val isDownloading: Boolean = false,
     val error: String? = null,
     val downloadStatus: String? = null
 )
 
 class VideoViewModel : ViewModel() {
     private val repository = VideoRepository()
+    private var localStorage: LocalStorageService? = null
     private val _state = MutableStateFlow(VideoUiState())
     val state: StateFlow<VideoUiState> = _state
 
+    fun init(context: Context) {
+        if (localStorage == null) {
+            localStorage = LocalStorageService(context.applicationContext)
+        }
+    }
+
     fun loadAllVideos() {
         viewModelScope.launch {
             _state.value = _state.value.copy(isLoading = true, error = null)
@@ -48,18 +60,50 @@ class VideoViewModel : ViewModel() {
     }
 
     fun triggerDownload(videoId: Int) {
-        viewModelScope.launch {
-            _state.value = _state.value.copy(downloadStatus = null)
-            repository.triggerDownload(videoId)
-                .onSuccess { status ->
-                    _state.value = _state.value.copy(downloadStatus = status)
+        viewModelScope.launch(Dispatchers.IO) {
+            _state.value = _state.value.copy(isDownloading = true, downloadStatus = null)
+            try {
+                // 1. Server-Download triggern
+                val result = repository.triggerDownload(videoId)
+                if (result.isFailure) {
+                    _state.value = _state.value.copy(
+                        isDownloading = false,
+                        downloadStatus = "Fehler: ${result.exceptionOrNull()?.message}"
+                    )
+                    return@launch
                 }
-                .onFailure { e ->
-                    _state.value = _state.value.copy(downloadStatus = "Fehler: ${e.message}")
+
+                // 2. Warten bis Server-Download fertig
+                val status = result.getOrNull()
+                if (status == "download_started") {
+                    while (true) {
+                        delay(2000)
+                        val videosResult = repository.getAllVideos()
+                        val video = videosResult.getOrNull()?.find { it.id == videoId }
+                        if (video?.is_downloaded == true) break
+                    }
                 }
+
+                // 3. Lokal speichern
+                localStorage?.downloadAndSave(videoId)
+                _state.value = _state.value.copy(
+                    isDownloading = false,
+                    downloadStatus = "Lokal gespeichert"
+                )
+            } catch (e: Exception) {
+                _state.value = _state.value.copy(
+                    isDownloading = false,
+                    downloadStatus = "Fehler: ${e.message}"
+                )
+            }
         }
     }
 
+    fun deleteLocalVideo(videoId: Int) {
+        localStorage?.deleteLocalFile(videoId)
+        _state.value = _state.value.copy(downloadStatus = "Lokal gelöscht")
+    }
+
     fun clearDownloadStatus() {
         _state.value = _state.value.copy(downloadStatus = null)
     }
@@ -68,5 +112,12 @@ class VideoViewModel : ViewModel() {
         return _state.value.allVideos.find { it.id == videoId }
     }
 
-    fun getStreamUrl(videoId: Int): String = repository.getStreamUrl(videoId)
+    fun isLocallyAvailable(videoId: Int): Boolean {
+        return localStorage?.isLocallyAvailable(videoId) == true
+    }
+
+    fun getPlaybackUri(videoId: Int): String {
+        val localFile = localStorage?.getLocalFile(videoId)
+        return localFile?.toURI()?.toString() ?: repository.getStreamUrl(videoId)
+    }
 }
diff --git a/backend/models.py b/backend/models.py
index 48f29a4..da6b7be 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -1,6 +1,4 @@
-from datetime import datetime
-
-from sqlalchemy import Column, DateTime, Integer, String
+from sqlalchemy import Column, Integer, String
 
 from database import Base
 
@@ -14,4 +12,3 @@ class Video(Base):
     thumbnail_url = Column(String, nullable=False)
     youtube_url = Column(String, nullable=False)
     file_path = Column(String, nullable=True)
-    created_at = Column(DateTime, default=datetime.utcnow)
diff --git a/backend/routes/__pycache__/videos.cpython-312.pyc b/backend/routes/__pycache__/videos.cpython-312.pyc
index 5f7519f3fcdbdfedd110d0e10f0b821fda97a7d0..ebcd159e8dacb2106e9dcb1a69fc69aa4c9c54f3 100644
GIT binary patch
delta 632
zcmdm>eNCJ9G%qg~0}#k3UCO*Rkyny2YodC!8zVysLkd@pXs%e47$XA{Ln=!OcM4BB
z;~L)8Od!<^3{m2#;#r0eHZqyQmnxYmAPE#&!$0wXq`d%;%MaqF2&QtUv7`vKu&#!x
zkCFl!VUDaB!bUT~6r_<UMHoq=3=WMVD0bIFG>Rf=l*Qp_vDJ(ayMbP1P3490(il_3
zQ{|v8mq0Q{9)|-YVLCzP)Z;Kn3dtY^90o}v8-&9g86<NQD;YIqUxNJLr^$GWB_OdR
zLv!+6rXFF&TYM?`<#{>zi7D}AnJKCHnv9#Rm`#`&1vlrj9c5&c-E7KX#K@?;IfFBU
ziBWU&MQ$HvMz_gw{7<;dfTk690Er)y=LxB9HWWx<V)UClO{kqwX|kN~I>}q&#i>PQ
vnaQcedc`G0sfoGqQ2yjI!Vz3)K#ib4Ev}ucC!)-Dm%-#NgX!iFkr+k*aI|#X

delta 429
zcmcbny+NDzG%qg~0}#yizm&OoBCjN4(nR%Yg<R1nQAP$PhE$dmt`zQc#x*>vnLw%-
z7^1{d#j^A#e`FTs=1rAI6_5mqt>K&Oz$mH659ITM_$dOZ+-WQ+f-S78L0W(yN)o8c
z6q_z_kXoh`AtbfZaJ9myHbB*iAgPssxrSMEHRI$7jN;N_sj^V}#gWv>!OUcqz)&ZN
zq)r~LP6|VvG?F@nN=8kY$<vr-3o_l}OUW<K%gIkni7(4cNzLEv!fe9KD6qMb?I<Io
z%w~HIBSuE0%|)CUOpF?vZ*%)FGrCUJ;D5qsx|vsC5)-5E<OM?QjEa*rgx5`eFC4*@
Z3JfkrATF+&94Mm9e4oL6bCpO8BLI8UVx9m1

diff --git a/backend/routes/videos.py b/backend/routes/videos.py
index c1d998d..c0a3540 100644
--- a/backend/routes/videos.py
+++ b/backend/routes/videos.py
@@ -8,7 +8,8 @@ from sqlalchemy.orm import Session
 from database import get_db
 from schemas import VideoCreate, VideoResponse
 from services import video_service
-from services.download_service import download_video, stream_video_live
+from services.download_service import download_video
+from services.stream_service import stream_video_live
 
 router = APIRouter(prefix="/videos", tags=["videos"])
 
diff --git a/backend/schemas.py b/backend/schemas.py
index 0467859..607f7f1 100644
--- a/backend/schemas.py
+++ b/backend/schemas.py
@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from pydantic import BaseModel
 
 
@@ -17,7 +15,6 @@ class VideoResponse(BaseModel):
     thumbnail_url: str
     youtube_url: str
     is_downloaded: bool
-    created_at: datetime
 
     class Config:
         from_attributes = True
@@ -31,5 +28,4 @@ class VideoResponse(BaseModel):
             thumbnail_url=video.thumbnail_url,
             youtube_url=video.youtube_url,
             is_downloaded=video.file_path is not None,
-            created_at=video.created_at,
         )
diff --git a/backend/services/__pycache__/download_service.cpython-312.pyc b/backend/services/__pycache__/download_service.cpython-312.pyc
index f08b6392c4bfaba9542f07e8f71cbe455cccc845..c73a32f3b84026786e2f6163acfbf0ebbdebf0c2 100644
GIT binary patch
delta 133
zcmbOxe36~+G%qg~0}zNLUCJzEn#d=?XfsjWmZg$WlVf9vKO<)qTV;uEN=`x5<TH$K
z7=<VAWa?zm<SOEw{Eoxaga@ec7IS7^$t~vMlA<DEAa^ChXOMA4LLey)o80`A(wtPg
bA}Ju35r~V`CdY89aD8DAViYct1PTBEZh0Zj

delta 1513
zcmaJ>%TF6e82`rmvc2}&!R9593)l*B5`@w`)KUmiv70tQltYP>O2Klyi(|94SF>xt
z$d=uzQgBNP$Wq{l+Djscs{RL6OHRGSAr<bn2M(3mLl0Kr5T!kI7C%6!^jqzGznSm%
zy=Hc{%sq4oKich9Aac3ydF*#)P3S=HuJw;NMOHG;m_+lZ^oQ0A@>{;W|30$3Vl&!+
zC@Zf@-=RNIYw3xpn2#XCyDl8jUh*Dnm;i1Af_2cE_BdHPEg}+4A|=vUh%(~Qv(0YN
zHC7H~QM`^%`o)bb4H>P2t-6j|8kS=%a$EHxa-^du%28QU0PeK{<mgfewYfw~mX4Yl
zBm~RtbZHv3=c6E6ze30BCwj3Rhi{-Pr8OYLg(hr*6IN$)u?e>MEvh!jF&3~umWk*8
zt9e(`qX|S?qr@DWWmS}9vg|`@9g#-7Bn;{Ev@~`L8ELvsTLEhJJV4<bA#|Qa0CK_^
z@_0dOYjAvkT}NU6*Xu4UkIcgYbr<H5_pBo9^_aCHN)M2ytKsv6nn!;71U5ch%#&g9
zjnY$eB|rF)q-u+%f#?T*N*5wwMN4BTluBz#TGMGwTF|f&RYz8xota4}Qk0NmevXV0
zosOiG%%Wu=k(!&4!%=myV+Mz#p;;+IbV9l)B@`_aN~BVAM=7!K4J@)sOp%5z`%OBl
zYI%{QGJq&y90PEIU%(EdM&rbBw~?ArH5^ljQsfxnl9HsPs56r(MM~=Q<a?7roeKo-
zOiYcB>ok_aqE63;3DbU4N=i7arEqY8OzGK}EbFwAl4U=KjVqzEI4`Mbnb^`;R&^?p
z5Os<`ol|fsBB`p*MDC}Pv#P=FsR?!)p65tSQaBNsi-}SyB**3?JV@3(<W+s-?)(8S
z3-GJGePy~hy>D|@Y|dvb<78aDSmkJowQ7Zq?oHn#F@I?11h()_)d{wim677e9`7mh
zo?X6Yk3V1L&u?nG{G~!*pLZ=?D2)B$a4k_4GrwXjT2})b-qp8$GQU=(!0Fznxd*pC
zzV+O3?*%>mo6xZ*c*=rjL){+wX7uss&d}c2RC#Rbg>a{Evufg*u8Po7ad)jx<ku$l
z-2G*D|090aeRV1Lv#X=xY^}7ke|EcS0f&neYH_aEine8;Y6hEYWw<!}`Hg3MZ-wCT
z;`kR6B)zTg<sk>Q&c6UL?G>}b;D0GpDKh)J%AW1@k9vKCY}hAnUkX~$_k&jh4E*5j
zBY21D4D?bv9#g;vJ3Yw2y_A7{-XKRk<tW1O^Vm@uqOQGZ{5W(fmeh2L911or@6lO2
wh64hjc3$S;L`qD{(hYo_tQkKy_4U%%l&|doT9B)Hp&NB=UO5D!@HJxm7jq6uR{#J2

diff --git a/backend/services/download_service.py b/backend/services/download_service.py
index baad68a..6f2debe 100644
--- a/backend/services/download_service.py
+++ b/backend/services/download_service.py
@@ -25,34 +25,3 @@ def download_video(video_id: int, youtube_url: str):
         update_file_path(db, video_id, output_path)
     finally:
         db.close()
-
-
-def stream_video_live(youtube_url: str):
-    result = subprocess.run(
-        [
-            "yt-dlp",
-            "-f", "bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best",
-            "-g", youtube_url,
-        ],
-        capture_output=True, text=True, check=True,
-    )
-    urls = result.stdout.strip().split("\n")
-
-    cmd = ["ffmpeg"]
-    for url in urls:
-        cmd.extend(["-i", url])
-    cmd.extend(["-c", "copy", "-movflags", "frag_keyframe+empty_moov", "-f", "mp4", "pipe:1"])
-
-    process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-    try:
-        while True:
-            chunk = process.stdout.read(1024 * 1024)
-            if not chunk:
-                break
-            yield chunk
-        process.wait()
-    except GeneratorExit:
-        process.kill()
-    finally:
-        if process.poll() is None:
-            process.kill()
diff --git a/backend/services/stream_service.py b/backend/services/stream_service.py
new file mode 100644
index 0000000..7cc47ec
--- /dev/null
+++ b/backend/services/stream_service.py
@@ -0,0 +1,32 @@
+import subprocess
+
+
+def stream_video_live(youtube_url: str):
+    result = subprocess.run(
+        [
+            "yt-dlp",
+            "-f", "bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best",
+            "-g", youtube_url,
+        ],
+        capture_output=True, text=True, check=True,
+    )
+    urls = result.stdout.strip().split("\n")
+
+    cmd = ["ffmpeg"]
+    for url in urls:
+        cmd.extend(["-i", url])
+    cmd.extend(["-c", "copy", "-movflags", "frag_keyframe+empty_moov", "-f", "mp4", "pipe:1"])
+
+    process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+    try:
+        while True:
+            chunk = process.stdout.read(1024 * 1024)
+            if not chunk:
+                break
+            yield chunk
+        process.wait()
+    except GeneratorExit:
+        process.kill()
+    finally:
+        if process.poll() is None:
+            process.kill()