THED2 commited on
Commit
91403a7
·
verified ·
1 Parent(s): 61c939a

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +100 -1
app.py CHANGED
@@ -246,4 +246,103 @@ def _download_single(url, path, state, cancel):
246
  except Exception:
247
  attempt += 1
248
  time.sleep(min(2 * attempt, 20))
249
- return "failed"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
246
  except Exception:
247
  attempt += 1
248
  time.sleep(min(2 * attempt, 20))
249
+ return "failed"
250
+
251
+ if total:
252
+ used_here = 0
253
+ for fn in os.listdir(DATA_DIR):
254
+ fp = os.path.join(DATA_DIR, fn)
255
+ try:
256
+ if os.path.isfile(fp):
257
+ used_here += os.path.getsize(fp)
258
+ except Exception:
259
+ pass
260
+ if used_here + total > MAX_TOTAL_STORAGE:
261
+ raise RuntimeError(
262
+ f"FILE TOO BIG FOR THIS SERVER: file {total/1e9:.2f}GB + stored "
263
+ f"{used_here/1e9:.2f}GB = {(used_here+total)/1e9:.2f}GB > limit "
264
+ f"{MAX_TOTAL_STORAGE/1e9:.1f}GB. HF free Space me 50GB ephemeral "
265
+ f"disk hai, uske upar container EVICT ho jata hai. Fix: Space "
266
+ f"Settings me persistent storage on karo ya chhoti file use karo.")
267
+
268
+ # ---- DISK CHECK ----
269
+ if total:
270
+ free = shutil.disk_usage(DATA_DIR).free
271
+ if free < total + DISK_MARGIN:
272
+ raise RuntimeError(f"Not enough disk: need {total/1e9:.1f}GB, free {free/1e9:.1f}GB")
273
+
274
+ # ---- progress ticker (har second speed + downloaded update) ----
275
+ state = {"task_id": task_id, "pos": 0}
276
+ seg_state = [0]
277
+ tasks[task_id]["_state"] = state
278
+ stop = threading.Event()
279
+
280
+ def ticker():
281
+ last = 0
282
+ last_t = time.time()
283
+ while not stop.is_set():
284
+ time.sleep(1.0)
285
+ try:
286
+ done = sum(seg_state) if tasks[task_id].get("resumable") else state.get("pos", 0)
287
+ now = time.time()
288
+ dt = now - last_t
289
+ if dt > 0:
290
+ sp = max(0.0, (done - last) / dt)
291
+ tasks[task_id]["speed"] = sp
292
+ tsize = tasks[task_id].get("total_size", 0) or 0
293
+ if sp > 0 and tsize:
294
+ tasks[task_id]["eta_seconds"] = int((tsize - done) / sp)
295
+ tasks[task_id]["downloaded"] = done
296
+ last, last_t = done, now
297
+ save_state()
298
+ except Exception:
299
+ pass
300
+
301
+ threading.Thread(target=ticker, daemon=True).start()
302
+
303
+ # ---- DOWNLOAD ----
304
+ result = None
305
+ with open(file_path, "wb"):
306
+ pass # file pehle banao, segments isi me pwrite karenge
307
+ if info.get("ranges") and total >= MIN_SIZE_FOR_PARALLEL:
308
+ seg_state = [0] * SEGMENTS
309
+ tasks[task_id]["_state"] = seg_state
310
+ res = _download_parallel(url, file_path, total, seg_state, cancel)
311
+ if "no_resume" in res:
312
+ tasks[task_id]["resumable"] = False
313
+ with open(file_path, "r+b") as f:
314
+ f.truncate(0)
315
+ result = _download_single(url, file_path, state, cancel)
316
+ elif "failed" in res:
317
+ result = "failed"
318
+ else:
319
+ result = "done"
320
+ else:
321
+ result = _download_single(url, file_path, state, cancel)
322
+
323
+ stop.set()
324
+
325
+ # ---- VERIFY (SABSE IMPORTANT FIX) ----
326
+ actual = os.path.getsize(file_path)
327
+ tasks[task_id]["downloaded"] = actual
328
+ if total and actual != total:
329
+ tasks[task_id]["status"] = "error"
330
+ tasks[task_id]["error"] = (f"INCOMPLETE: got {actual} of {total} bytes "
331
+ f"(missing {total-actual}). Server ne beech me "
332
+ f"connection band kar diya.")
333
+ return
334
+ if result != "done":
335
+ tasks[task_id]["status"] = "error"
336
+ tasks[task_id]["error"] = "Download failed after maximum retries"
337
+ return
338
+
339
+ tasks[task_id]["status"] = "completed"
340
+ tasks[task_id]["speed"] = 0.0
341
+ tasks[task_id]["verified"] = True
342
+ except Exception as e:
343
+ tasks[task_id]["status"] = "error"
344
+ tasks[task_id]["error"] = str(e)
345
+ finally:
346
+ save_state()
347
+ gc.collect()
348
+