idm-cli 1.3.0__tar.gz → 1.3.1__tar.gz

idm_cli-1.3.1/MANIFEST.in

@@ -0,0 +1 @@
+include requirements.txt

{idm_cli-1.3.0/idm_cli.egg-info → idm_cli-1.3.1}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: idm-cli
-Version: 1.3.0
+Version: 1.3.1
 Summary: A lightning-fast, universal command-line download manager
 Home-page: https://github.com/rj41-w2/idm-cli
 Author: Rehan
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/rj41-w2/idm-cli
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Console
 Requires-Python: >=3.8
@@ -22,35 +23,43 @@ Requires-Dist: aiodns
 Requires-Dist: Brotli
 Requires-Dist: psutil
 Requires-Dist: platformdirs
-Requires-Dist: pytest
-Requires-Dist: pytest-asyncio
-Dynamic: author
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
+Requires-Dist: packaging; extra == "dev"
 Dynamic: home-page
 Dynamic: license-file
-Dynamic: requires-dist
 Dynamic: requires-python
-Dynamic: summary
 
-# IDM-CLI (Internet Download Manager CLI)
+<div align="center">
 
-*Inspired by the official [Internet Download Manager (IDM)](https://www.internetdownloadmanager.com/)*
+<h1>IDM-CLI</h1>
 
-A lightning-fast, cross-platform command-line download manager written in Python. IDM-CLI splits files into multiple parallel chunks (default 8, up to 32) to maximize your internet speed. It supports downloading from **YouTube**, **Facebook**, **Instagram**, and any **Direct File URL** (`.exe`, `.zip`, `.pdf`, etc.).
+**A lightning-fast, cross-platform command-line download manager written in Python.**
+
+*The official IDM asks you to pay after 30 days — IDM-CLI is 100% free, open-source, and yours to modify!*
+
+[![PyPI version](https://img.shields.io/pypi/v/idm-cli?color=blue&label=pypi%20version)](https://pypi.org/project/idm-cli/)
+[![Downloads](https://static.pepy.tech/badge/idm-cli)](https://pepy.tech/project/idm-cli)
+[![License](https://img.shields.io/badge/License-MIT-green.svg)](https://github.com/rj41-w2/idm-cli/blob/main/LICENSE)
+![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey)
+[![Install](https://img.shields.io/badge/install-pip%20install%20idm--cli-brightgreen)](https://pypi.org/project/idm-cli/)
+
+[Download via PyPI](https://pypi.org/project/idm-cli/) · [Report a Bug](https://github.com/rj41-w2/idm-cli/issues)
+
+</div>
+
+IDM-CLI splits files into multiple parallel chunks (default 8, up to 32) to maximize your internet speed. It supports downloading from **YouTube**, **Facebook**, **Instagram**, and any **Direct File URL** (`.exe`, `.zip`, `.pdf`, etc.).
 
 ## Features
 
 - **Parallel Chunk Engine** — Splits downloads into multiple concurrent chunks using `aiohttp` async sessions to fully saturate your bandwidth.
-- **Universal Downloader** — Paste any direct URL. A built-in HTTP `HEAD` detector automatically recognizes file types and routes them to the parallel engine.
-- **Social Media Support** — Natively supports YouTube, Facebook, and Instagram via a modular extractor architecture with yt-dlp.
+- **Universal Downloader** — Paste any URL. yt-dlp handles 1000+ sites (YouTube, Facebook, Instagram, etc.), with automatic fallback to direct HTTP download for unsupported URLs.
 - **Audio Only / MP3 Conversion** — Download videos as audio. IDM-CLI automatically grabs the best audio stream and uses FFmpeg to convert it to `.mp3`.
 - **Smart Auto-Resume** — Internet dropped? Pressed `Ctrl+C`? No problem. IDM-CLI remembers the exact byte positions of all incomplete chunks. Paste the same link again to resume instantly.
 - **Persistent Queue System** — Add multiple files to a queue with `-Q` and type `start queue` to download them all sequentially.
-- **Browser Extension Integration** — Chrome/Edge extension intercepts downloads and routes them directly into IDM-CLI via Native Messaging.
 - **Interactive UI** — Modern terminal interface powered by `rich` and `questionary` with real-time speed, ETA, and progress bars. Press `p` to pause, `r` to resume.
-- **Cross-Platform** — Works on Windows, macOS, and Linux with platform-specific FFmpeg handling and browser registration.
+- **Cross-Platform** — Works on Windows, macOS, and Linux with platform-specific FFmpeg handling.
 - **Auto-Update Check** — Checks PyPI once a day and notifies you when a new version is available.
 
 ## Prerequisites
@@ -118,22 +127,9 @@ idm "https://facebook.com/..." -Q
 | `<URL>` | Download a video or file |
 | `resume` | Resume or delete incomplete downloads |
 | `start queue` | Process all queued downloads |
-| `install extension` | Guide to install the browser extension |
 | `help` | Show available commands and flags |
 | `exit` | Exit the application |
 
-### Browser Extension
-
-IDM-CLI includes a Chrome/Edge extension that intercepts file downloads automatically. To install it:
-
-```bash
-idm
-# then type:
-install extension
-```
-
-Follow the on-screen guide to load the unpacked extension and link it to IDM-CLI.
-
 ### Troubleshooting: Windows Device Guard
 
 If you get `"idm.exe was blocked by your organization's Device Guard policy"`, run the Python module directly:
@@ -161,69 +157,13 @@ idm_cli/
 │   ├── ytdlp.py             # YouTube/social media extractor
 │   ├── direct.py            # Direct HTTP file downloader
 │   └── winget.py            # Windows Package Manager extractor
-└── extension/
-    ├── extension.py         # Browser extension installer
-    ├── native_host.py       # Native Messaging Host
-    ├── daemon.py            # Queue daemon with PID lock
-    └── browser_extension/   # Chrome/Edge extension source
 ```
 
 ## Contributing
 
-Contributions are welcome — whether it's a bug fix, a new feature, or just improving the docs.
-
-### Reporting Bugs
-
-If you find a bug, [open an issue](https://github.com/rj41-w2/idm-cli/issues/new) with:
-
-- A clear title and description of the problem
-- Steps to reproduce the issue
-- Your OS and Python version (`python --version`)
-- The full error output if there is one
-
-### Suggesting Features
-
-Got an idea? [Open an issue](https://github.com/rj41-w2/idm-cli/issues/new) with the tag `enhancement` and describe:
-
-- What you want to happen and why
-- How it would work from the user's perspective
-- Any alternatives you considered
-
-### Submitting a Pull Request
-
-1. **Fork** the repository from [github.com/rj41-w2/idm-cli](https://github.com/rj41-w2/idm-cli)
-
-2. **Clone your fork** and set it up:
-   ```bash
-   git clone https://github.com/<your-username>/idm-cli.git
-   cd IDM-CLI
-   pip install -r requirements.txt
-   pip install -e .
-   ```
-
-3. **Create a branch** for your change:
-   ```bash
-   git checkout -b fix/short-description
-   ```
-
-4. **Make your changes**, test them, and commit with a clear message:
-   ```bash
-   git commit -m "fix: describe the bug you fixed"
-   ```
-
-5. **Push** to your fork and open a Pull Request against `main`:
-   ```bash
-   git push origin fix/short-description
-   ```
-
-6. In your PR description, explain **what changed** and **why**. Link the issue if there is one.
-
-### Guidelines
+Contributions are welcome. Fork the repo, make your changes on a feature branch, and open a PR against `main`. Keep changes focused and follow the existing code style.
 
-- Keep PRs focused on a single change. Don't mix unrelated fixes.
-- Follow the existing code style — no comments unless absolutely necessary.
-- Test your changes on at least one platform before submitting.
-- If you're adding a feature, update the README and spec if needed.
+For bug reports and feature requests, [open an issue](https://github.com/rj41-w2/idm-cli/issues).
 
 ## License
 

{idm_cli-1.3.0 → idm_cli-1.3.1}/README.md

@@ -1,20 +1,32 @@
-# IDM-CLI (Internet Download Manager CLI)
+<div align="center">
 
-*Inspired by the official [Internet Download Manager (IDM)](https://www.internetdownloadmanager.com/)*
+<h1>IDM-CLI</h1>
 
-A lightning-fast, cross-platform command-line download manager written in Python. IDM-CLI splits files into multiple parallel chunks (default 8, up to 32) to maximize your internet speed. It supports downloading from **YouTube**, **Facebook**, **Instagram**, and any **Direct File URL** (`.exe`, `.zip`, `.pdf`, etc.).
+**A lightning-fast, cross-platform command-line download manager written in Python.**
+
+*The official IDM asks you to pay after 30 days — IDM-CLI is 100% free, open-source, and yours to modify!*
+
+[![PyPI version](https://img.shields.io/pypi/v/idm-cli?color=blue&label=pypi%20version)](https://pypi.org/project/idm-cli/)
+[![Downloads](https://static.pepy.tech/badge/idm-cli)](https://pepy.tech/project/idm-cli)
+[![License](https://img.shields.io/badge/License-MIT-green.svg)](https://github.com/rj41-w2/idm-cli/blob/main/LICENSE)
+![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey)
+[![Install](https://img.shields.io/badge/install-pip%20install%20idm--cli-brightgreen)](https://pypi.org/project/idm-cli/)
+
+[Download via PyPI](https://pypi.org/project/idm-cli/) · [Report a Bug](https://github.com/rj41-w2/idm-cli/issues)
+
+</div>
+
+IDM-CLI splits files into multiple parallel chunks (default 8, up to 32) to maximize your internet speed. It supports downloading from **YouTube**, **Facebook**, **Instagram**, and any **Direct File URL** (`.exe`, `.zip`, `.pdf`, etc.).
 
 ## Features
 
 - **Parallel Chunk Engine** — Splits downloads into multiple concurrent chunks using `aiohttp` async sessions to fully saturate your bandwidth.
-- **Universal Downloader** — Paste any direct URL. A built-in HTTP `HEAD` detector automatically recognizes file types and routes them to the parallel engine.
-- **Social Media Support** — Natively supports YouTube, Facebook, and Instagram via a modular extractor architecture with yt-dlp.
+- **Universal Downloader** — Paste any URL. yt-dlp handles 1000+ sites (YouTube, Facebook, Instagram, etc.), with automatic fallback to direct HTTP download for unsupported URLs.
 - **Audio Only / MP3 Conversion** — Download videos as audio. IDM-CLI automatically grabs the best audio stream and uses FFmpeg to convert it to `.mp3`.
 - **Smart Auto-Resume** — Internet dropped? Pressed `Ctrl+C`? No problem. IDM-CLI remembers the exact byte positions of all incomplete chunks. Paste the same link again to resume instantly.
 - **Persistent Queue System** — Add multiple files to a queue with `-Q` and type `start queue` to download them all sequentially.
-- **Browser Extension Integration** — Chrome/Edge extension intercepts downloads and routes them directly into IDM-CLI via Native Messaging.
 - **Interactive UI** — Modern terminal interface powered by `rich` and `questionary` with real-time speed, ETA, and progress bars. Press `p` to pause, `r` to resume.
-- **Cross-Platform** — Works on Windows, macOS, and Linux with platform-specific FFmpeg handling and browser registration.
+- **Cross-Platform** — Works on Windows, macOS, and Linux with platform-specific FFmpeg handling.
 - **Auto-Update Check** — Checks PyPI once a day and notifies you when a new version is available.
 
 ## Prerequisites
@@ -82,22 +94,9 @@ idm "https://facebook.com/..." -Q
 | `<URL>` | Download a video or file |
 | `resume` | Resume or delete incomplete downloads |
 | `start queue` | Process all queued downloads |
-| `install extension` | Guide to install the browser extension |
 | `help` | Show available commands and flags |
 | `exit` | Exit the application |
 
-### Browser Extension
-
-IDM-CLI includes a Chrome/Edge extension that intercepts file downloads automatically. To install it:
-
-```bash
-idm
-# then type:
-install extension
-```
-
-Follow the on-screen guide to load the unpacked extension and link it to IDM-CLI.
-
 ### Troubleshooting: Windows Device Guard
 
 If you get `"idm.exe was blocked by your organization's Device Guard policy"`, run the Python module directly:
@@ -125,69 +124,13 @@ idm_cli/
 │   ├── ytdlp.py             # YouTube/social media extractor
 │   ├── direct.py            # Direct HTTP file downloader
 │   └── winget.py            # Windows Package Manager extractor
-└── extension/
-    ├── extension.py         # Browser extension installer
-    ├── native_host.py       # Native Messaging Host
-    ├── daemon.py            # Queue daemon with PID lock
-    └── browser_extension/   # Chrome/Edge extension source
 ```
 
 ## Contributing
 
-Contributions are welcome — whether it's a bug fix, a new feature, or just improving the docs.
-
-### Reporting Bugs
-
-If you find a bug, [open an issue](https://github.com/rj41-w2/idm-cli/issues/new) with:
-
-- A clear title and description of the problem
-- Steps to reproduce the issue
-- Your OS and Python version (`python --version`)
-- The full error output if there is one
-
-### Suggesting Features
-
-Got an idea? [Open an issue](https://github.com/rj41-w2/idm-cli/issues/new) with the tag `enhancement` and describe:
-
-- What you want to happen and why
-- How it would work from the user's perspective
-- Any alternatives you considered
-
-### Submitting a Pull Request
-
-1. **Fork** the repository from [github.com/rj41-w2/idm-cli](https://github.com/rj41-w2/idm-cli)
-
-2. **Clone your fork** and set it up:
-   ```bash
-   git clone https://github.com/<your-username>/idm-cli.git
-   cd IDM-CLI
-   pip install -r requirements.txt
-   pip install -e .
-   ```
-
-3. **Create a branch** for your change:
-   ```bash
-   git checkout -b fix/short-description
-   ```
-
-4. **Make your changes**, test them, and commit with a clear message:
-   ```bash
-   git commit -m "fix: describe the bug you fixed"
-   ```
-
-5. **Push** to your fork and open a Pull Request against `main`:
-   ```bash
-   git push origin fix/short-description
-   ```
-
-6. In your PR description, explain **what changed** and **why**. Link the issue if there is one.
-
-### Guidelines
+Contributions are welcome. Fork the repo, make your changes on a feature branch, and open a PR against `main`. Keep changes focused and follow the existing code style.
 
-- Keep PRs focused on a single change. Don't mix unrelated fixes.
-- Follow the existing code style — no comments unless absolutely necessary.
-- Test your changes on at least one platform before submitting.
-- If you're adding a feature, update the README and spec if needed.
+For bug reports and feature requests, [open an issue](https://github.com/rj41-w2/idm-cli/issues).
 
 ## License
 

idm_cli-1.3.1/idm_cli/__init__.py

@@ -0,0 +1,3 @@
+# IDM-CLI Package
+
+__version__ = "1.3.1"

{idm_cli-1.3.0 → idm_cli-1.3.1}/idm_cli/config.py

@@ -6,13 +6,15 @@ import logging
 from logging.handlers import RotatingFileHandler
 from platformdirs import user_data_dir, user_downloads_dir
 
+__all__ = ["CONFIG_DIR", "CONFIG_FILE", "logger", "load_config", "save_config", "setup_logging"]
+
 APP_NAME = "idm-cli"
 APP_AUTHOR = "idm-cli"
 CONFIG_DIR = user_data_dir(APP_NAME, APP_AUTHOR)
 CONFIG_FILE = os.path.join(CONFIG_DIR, "config.json")
 LOG_FILE = os.path.join(CONFIG_DIR, "idm.log")
 
-def _migrate_old_config():
+def _migrate_old_config() -> None:
     old_dir = os.path.expanduser("~/.idm_cli")
     if old_dir == CONFIG_DIR:
         return
@@ -20,6 +22,8 @@ def _migrate_old_config():
         return
     os.makedirs(CONFIG_DIR, exist_ok=True)
     for item in os.listdir(old_dir):
+        if item == "__pycache__":
+            continue
         src = os.path.join(old_dir, item)
         dst = os.path.join(CONFIG_DIR, item)
         if not os.path.exists(dst):
@@ -34,16 +38,22 @@ def _migrate_old_config():
 def _get_default_download_dir() -> str:
     return user_downloads_dir()
 
-def setup_logging():
+def setup_logging() -> logging.Logger:
     _migrate_old_config()
     os.makedirs(CONFIG_DIR, exist_ok=True)
     logger = logging.getLogger("idm_cli")
     logger.setLevel(logging.DEBUG)
     if not logger.handlers:
-        handler = RotatingFileHandler(LOG_FILE, maxBytes=5*1024*1024, backupCount=2)
         formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-        handler.setFormatter(formatter)
-        logger.addHandler(handler)
+
+        file_handler = RotatingFileHandler(LOG_FILE, maxBytes=5*1024*1024, backupCount=2, encoding="utf-8")
+        file_handler.setFormatter(formatter)
+        logger.addHandler(file_handler)
+
+        stream_handler = logging.StreamHandler()
+        stream_handler.setFormatter(formatter)
+        stream_handler.stream.reconfigure(errors="backslashreplace")
+        logger.addHandler(stream_handler)
     return logger
 
 logger = setup_logging()
@@ -55,7 +65,7 @@ DEFAULT_CONFIG = {
     "last_version": "0.0.0"
 }
 
-def load_config():
+def load_config() -> dict:
     config = DEFAULT_CONFIG.copy()
     if os.path.exists(CONFIG_FILE):
         try:
@@ -66,7 +76,7 @@ def load_config():
             logger.warning(f"Failed to load config: {e}")
     return config
 
-def save_config(config_data):
+def save_config(config_data: dict) -> None:
     os.makedirs(CONFIG_DIR, exist_ok=True)
     try:
         with open(CONFIG_FILE, "w") as f:

{idm_cli-1.3.0 → idm_cli-1.3.1}/idm_cli/downloader/core.py

@@ -13,6 +13,16 @@ from idm_cli.downloader.muxer import mux_audio_video, convert_to_mp3
 from idm_cli.ui.utils import console, custom_style, sanitize_filename
 from idm_cli.config import logger
 
+def run_download_and_mux(video_url, audio_url, headers, chunks, video_dest, audio_dest, final_dest, media_type, pause_event, warning_state):
+    asyncio.run(download_media(video_url, audio_url, headers, chunks, video_dest, audio_dest, pause_event, warning_state, media_type))
+    if video_dest and audio_dest:
+        mux_audio_video(video_dest, audio_dest, final_dest)
+    elif audio_dest and not video_dest:
+        convert_to_mp3(audio_dest, final_dest)
+    elif video_dest and not audio_dest:
+        shutil.move(video_dest, final_dest)
+    return True
+
 def process_download(
     current_url: str,
     is_interactive: bool,
@@ -55,11 +65,20 @@ def process_download(
     with console.status("[bold cyan]Fetching metadata...", spinner="dots"):
         try:
             extractor = get_extractor(url_to_extract)
-            info = extractor.fetch_all_info(url_to_extract)
+            try:
+                info = extractor.fetch_all_info(url_to_extract)
+            except Exception:
+                if extractor.__name__ == "idm_cli.extractors.ytdlp":
+                    import importlib
+                    extractor = importlib.import_module("idm_cli.extractors.direct")
+                    info = extractor.fetch_all_info(url_to_extract)
+                else:
+                    raise
+
             title = info.get("title", "download") if not found_task_id else title
             if loop_filename and not found_task_id:
                 title = os.path.basename(loop_filename)
-            
+
             if info.get("_type") == "playlist":
                 console.print("\n[bold yellow]Currently, the feature to download album/playlist photos or videos is not added.[/]")
                 if not is_interactive:
@@ -75,6 +94,12 @@ def process_download(
             if not is_interactive:
                 raise typer.Exit(code=1)
             return False
+        except Exception as e:
+            logger.error(f"Error fetching info: {e}")
+            console.print(f"[bold red]Error:[/] {e}")
+            if not is_interactive:
+                raise typer.Exit(code=1)
+            return False
 
     if not found_task_id:
         if format_id != "audio_only":
@@ -264,7 +289,7 @@ def process_download(
     signal.signal(signal.SIGINT, custom_handler)
 
     try:
-        asyncio.run(download_media(video_url, audio_url, headers, loop_chunks, video_dest, audio_dest, pause_event, warning_state, media_type))
+        run_download_and_mux(video_url, audio_url, headers, loop_chunks, video_dest, audio_dest, final_dest, media_type, pause_event, warning_state)
     except KeyboardInterrupt:
         console.print("\n[bold red]Download cancelled by user. Progress saved to resume later.[/bold red]")
         return False
@@ -283,22 +308,6 @@ def process_download(
         signal.signal(signal.SIGINT, original_sigint)
 
     console.print("\n[bold green]✓[/] Downloads completed.")
-    console.print("[bold cyan]Muxing audio and video streams...[/]")
-
-    with console.status("[bold magenta]Running FFmpeg...", spinner="bouncingBar"):
-        try:
-            if video_dest and audio_dest:
-                mux_audio_video(video_dest, audio_dest, final_dest)
-            elif audio_dest and not video_dest:
-                convert_to_mp3(audio_dest, final_dest)
-            elif video_dest and not audio_dest:
-                shutil.move(video_dest, final_dest)
-        except (ValueError, TypeError, OSError) as e:
-            logger.error(f"Muxing failed: {e}")
-            console.print(f"[bold red]Muxing failed:[/] {e}")
-            if not is_interactive:
-                raise typer.Exit(code=1)
-            return False
 
     remove_download(task_id)
     console.print(f"\n[bold green] Success! {media_type} saved as:[/] [bold white]{final_dest}[/]")

{idm_cli-1.3.0 → idm_cli-1.3.1}/idm_cli/downloader/downloader.py

@@ -15,7 +15,7 @@ from rich.progress import (
 from idm_cli.ui.utils import console, progress_listener
 from idm_cli.config import logger
 
-async def _download_chunk(session: aiohttp.ClientSession, url: str, start: int, end: int, chunk_index: int, dest_path: str, headers: dict, progress_queue: asyncio.Queue, task_id, pause_event: asyncio.Event = None, chunk_progress: dict = None):
+async def _download_chunk(session: aiohttp.ClientSession, url: str, start: int, end: int, chunk_index: int, dest_path: str, headers: dict, progress_queue: asyncio.Queue, task_id, pause_event: asyncio.Event = None, chunk_progress: dict = None, chunk_lock: asyncio.Lock = None):
     max_retries = 10
     retry_count = 0
     progress_file = f"{dest_path}.progress.json"
@@ -33,6 +33,7 @@ async def _download_chunk(session: aiohttp.ClientSession, url: str, start: int,
                 chunk_headers['Range'] = f'bytes={current_start}-'
             else:
                 chunk_headers['Range'] = f'bytes={current_start}-{end}'
+            chunk_headers['Accept-Encoding'] = 'identity'
             
             async with session.get(url, headers=chunk_headers) as response:
                 response.raise_for_status()
@@ -59,12 +60,21 @@ async def _download_chunk(session: aiohttp.ClientSession, url: str, start: int,
                         await f.write(chunk)
                         
                         if chunk_progress is not None:
-                            chunk_progress[str(chunk_index)] = chunk_progress.get(str(chunk_index), 0) + len(chunk)
-                            try:
-                                async with aiofiles.open(progress_file, 'w') as pf:
-                                    await pf.write(json.dumps(chunk_progress))
-                            except OSError as e:
-                                logger.debug(f"Failed to write progress: {e}")
+                            if chunk_lock is not None:
+                                async with chunk_lock:
+                                    chunk_progress[str(chunk_index)] = chunk_progress.get(str(chunk_index), 0) + len(chunk)
+                                    try:
+                                        async with aiofiles.open(progress_file, 'w') as pf:
+                                            await pf.write(json.dumps(chunk_progress))
+                                    except OSError as e:
+                                        logger.debug(f"Failed to write progress: {e}")
+                            else:
+                                chunk_progress[str(chunk_index)] = chunk_progress.get(str(chunk_index), 0) + len(chunk)
+                                try:
+                                    async with aiofiles.open(progress_file, 'w') as pf:
+                                        await pf.write(json.dumps(chunk_progress))
+                                except OSError as e:
+                                    logger.debug(f"Failed to write progress: {e}")
                                 
                         if progress_queue is not None and task_id is not None:
                             current_task_id = task_id[chunk_index] if isinstance(task_id, list) else task_id
@@ -74,12 +84,21 @@ async def _download_chunk(session: aiohttp.ClientSession, url: str, start: int,
                                 'bytes_downloaded': len(chunk)
                             })
             return dest_path
-        except (aiohttp.client_exceptions.ClientPayloadError, asyncio.TimeoutError, aiohttp.client_exceptions.ClientError) as e:
+        except (aiohttp.ClientPayloadError, asyncio.TimeoutError, aiohttp.ClientConnectionError, aiohttp.ClientConnectorError) as e:
             retry_count += 1
             if retry_count >= max_retries:
                 raise ConnectionError("Your poor internet connection. Try again.")
             logger.warning(f"Chunk {chunk_index} retry {retry_count}/{max_retries}: {e}")
             await asyncio.sleep(min(2 ** retry_count, 30))
+        except aiohttp.ClientResponseError as e:
+            if e.status >= 500:
+                retry_count += 1
+                if retry_count >= max_retries:
+                    raise ConnectionError(f"Server error {e.status}. Try again.")
+                logger.warning(f"Chunk {chunk_index} retry {retry_count}/{max_retries}: HTTP {e.status}")
+                await asyncio.sleep(min(2 ** retry_count, 30))
+            else:
+                raise
 
 async def download_file(session: aiohttp.ClientSession, url: str, dest_path: str, headers: dict, num_chunks: int = 8, progress_queue: asyncio.Queue = None, task_id = None, pause_event: asyncio.Event = None):
     """
@@ -89,19 +108,35 @@ async def download_file(session: aiohttp.ClientSession, url: str, dest_path: str
     chunk_progress = {}
     
     if os.path.exists(dest_path) and not os.path.exists(progress_file):
-        file_size = os.path.getsize(dest_path)
-        if progress_queue is not None and task_id is not None:
-            if isinstance(task_id, list):
-                chunk_size_est = file_size // num_chunks
-                for i in range(num_chunks):
-                    end = file_size - 1 if i == num_chunks - 1 else ((i * chunk_size_est) + chunk_size_est - 1)
-                    c_size = end - (i * chunk_size_est) + 1
-                    await progress_queue.put({'task_id': task_id[i], 'total_size': c_size})
-                    await progress_queue.put({'task_id': task_id[i], 'bytes_downloaded': c_size})
-            else:
-                await progress_queue.put({'task_id': task_id, 'total_size': file_size})
-                await progress_queue.put({'task_id': task_id, 'bytes_downloaded': file_size})
-        return
+        local_size = os.path.getsize(dest_path)
+        server_size = None
+        try:
+            async with session.head(url, headers=headers or {}, allow_redirects=True) as response:
+                response.raise_for_status()
+                cl = response.headers.get('Content-Length')
+                if cl:
+                    server_size = int(cl)
+        except aiohttp.ClientError:
+            pass
+        if server_size is not None and local_size != server_size:
+            logger.debug(f"File exists but size mismatch (local={local_size}, server={server_size}), restarting download")
+            try:
+                os.remove(dest_path)
+            except OSError:
+                pass
+        else:
+            if progress_queue is not None and task_id is not None:
+                if isinstance(task_id, list):
+                    chunk_size_est = local_size // num_chunks
+                    for i in range(num_chunks):
+                        end = local_size - 1 if i == num_chunks - 1 else ((i * chunk_size_est) + chunk_size_est - 1)
+                        c_size = end - (i * chunk_size_est) + 1
+                        await progress_queue.put({'task_id': task_id[i], 'total_size': c_size})
+                        await progress_queue.put({'task_id': task_id[i], 'bytes_downloaded': c_size})
+                else:
+                    await progress_queue.put({'task_id': task_id, 'total_size': local_size})
+                    await progress_queue.put({'task_id': task_id, 'bytes_downloaded': local_size})
+            return
 
     if os.path.exists(progress_file):
         try:
@@ -121,6 +156,7 @@ async def download_file(session: aiohttp.ClientSession, url: str, dest_path: str
     try:
         range_headers = headers.copy()
         range_headers['Range'] = 'bytes=0-0'
+        range_headers['Accept-Encoding'] = 'identity'
         async with session.get(url, headers=range_headers, allow_redirects=True) as response:
             response.raise_for_status()
             content_range = response.headers.get('Content-Range')
@@ -204,12 +240,13 @@ async def download_file(session: aiohttp.ClientSession, url: str, dest_path: str
                 })
 
     chunk_size = file_size // num_chunks
+    chunk_lock = asyncio.Lock()
     tasks = []
     for i in range(num_chunks):
         start = i * chunk_size
         end = file_size - 1 if i == num_chunks - 1 else (start + chunk_size - 1)
         tasks.append(
-            _download_chunk(session, url, start, end, i, dest_path, headers, progress_queue, task_id, pause_event, chunk_progress)
+            _download_chunk(session, url, start, end, i, dest_path, headers, progress_queue, task_id, pause_event, chunk_progress, chunk_lock)
         )
         
     await asyncio.gather(*tasks)
@@ -239,7 +276,7 @@ async def download_media(video_url: str, audio_url: str, headers: dict, chunks:
 
         listener = asyncio.create_task(progress_listener(queue, progress, pause_event, warning_state))
 
-        conn_limit = min(chunks, 8)
+        conn_limit = min(chunks * 2, 16)
         async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=None, sock_read=10), connector=aiohttp.TCPConnector(limit=conn_limit, limit_per_host=conn_limit)) as session:
             v_task = asyncio.create_task(download_file(session, video_url, video_dest, headers, chunks, queue, video_task_ids, pause_event)) if video_url else None
             a_task = asyncio.create_task(download_file(session, audio_url, audio_dest, headers, chunks, queue, audio_task_id, pause_event)) if audio_url else None