qdown 1.0.0__tar.gz → 1.0.3__tar.gz

qdown-1.0.3/PKG-INFO

@@ -0,0 +1,68 @@
+Metadata-Version: 2.1
+Name: qdown
+Version: 1.0.3
+Summary: Client for QualitegDrive
+Home-page: https://github.com/qualiteg/qdown
+Author: Qualiteg Inc.
+Author-email: qualiteger@qualiteg.com
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+
+# qdown
+
+A Python client for downloading files from QualitegDrive operated by Qualiteg Inc.
+
+# install
+
+```
+pip install qdown
+```
+
+or 
+
+```
+pip install git+https://github.com/qualiteg/qdown.git
+```
+
+# usage
+
+```
+
+qdown ID [options]
+
+Options:
+-O FILENAME     Specify output filename
+-o DIR          Specify output directory
+-s SERVER       Specify server URL (default: https://drive.qualiteg.com)
+-q, --quiet     Hide progress display
+-h, --help      Display help
+```
+
+## download example1
+
+```
+qdown xxxxxxxxxxxxx -O my_file.txt
+```
+
+## download example2
+
+From Your Original HTTP Server
+
+```
+qdown xxxxxxxxxxxxx -O my_file.txt -s http://host.docker.internal:3000 
+```
+
+
+# uninstall
+
+```
+pip uninstall qdown -y
+```

{qdown-1.0.0 → qdown-1.0.3}/README.md

@@ -31,7 +31,7 @@ Options:
 ## download example1
 
 ```
-gdown xxxxxxxxxxxxx -O my_file.txt
+qdown xxxxxxxxxxxxx -O my_file.txt
 ```
 
 ## download example2
@@ -39,7 +39,7 @@ gdown xxxxxxxxxxxxx -O my_file.txt
 From Your Original HTTP Server
 
 ```
-gdown xxxxxxxxxxxxx -O my_file.txt -s http://host.docker.internal:3000 
+qdown xxxxxxxxxxxxx -O my_file.txt -s http://host.docker.internal:3000 
 ```
 
 

qdown-1.0.3/qdown/__init__.py

@@ -0,0 +1,83 @@
+"""
+
+Copyright (c) 2023 Qualiteg Inc. all rights reserved.
+
+This program is dual-licensed under the terms of the:
+1) GNU Affero General Public License, version 3, or any later version.
+2) A commercial license agreement provided by Qualiteg Inc.
+
+If you choose to use or redistribute this program under the terms of AGPLv3:
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+If you wish to use or redistribute this program under a commercial license:
+Please contact Qualiteg Inc.(https://qualiteg.com/contact) directly to obtain the terms and pricing.
+
+"""
+
+import asyncio
+import re
+from .qdown import QDown
+
+
+def extract_file_id(url):
+    """
+    URLからファイルIDを抽出する
+
+    Args:
+        url (str): ファイルURL
+            例1: https://drive.qualiteg.com/file/3kMM-X9S6-bMioFU0Fn8nHjAgQgWmG
+            例2: https://drive.qualiteg.com/download/1Lki-o8QO-DCUmg60JRxGdXfif
+
+    Returns:
+        str: ファイルID
+    """
+    # /file/XXX 形式のURL
+    file_pattern = r'https://drive\.qualiteg\.com/file/([a-zA-Z0-9_-]+)'
+    file_match = re.search(file_pattern, url)
+    if file_match:
+        return file_match.group(1)
+
+    # /download/XXX 形式のURL
+    download_pattern = r'https://drive\.qualiteg\.com/download/([a-zA-Z0-9_-]+)'
+    download_match = re.search(download_pattern, url)
+    if download_match:
+        return download_match.group(1)
+
+    return url  # IDと思われる場合はそのまま返す
+
+
+def download(download_url, output_path=None, output_dir=None, server_url="https://drive.qualiteg.com", quiet=False):
+    """
+    URLを指定してファイルをダウンロード
+
+    Args:
+        download_url (str): ダウンロードURL or ファイルID
+        output_path (str, optional): 出力ファイルパス
+        output_dir (str, optional): 出力ディレクトリ
+        server_url (str, optional): サーバーURL
+        quiet (bool, optional): 進捗表示を非表示にするかどうか
+
+    Returns:
+        str: ダウンロードしたファイルのパス
+    """
+    # URLからファイルIDを抽出
+    file_id = extract_file_id(download_url)
+
+    # QDownクライアントの初期化
+    client = QDown(server_url=server_url, quiet=quiet)
+
+    # 非同期ダウンロードを実行
+    return asyncio.run(client.download_by_file_id(
+        file_id=file_id,
+        output=output_path,
+        output_dir=output_dir
+    ))

qdown-1.0.0/qdown/gdown.py → qdown-1.0.3/qdown/qdown.py

@@ -1,4 +1,3 @@
-
 """
 qdown - Client for QualitegDrive
 
@@ -18,6 +17,7 @@ import os
 import sys
 import argparse
 import asyncio
+import urllib.parse
 from pathlib import Path
 from tqdm import tqdm
 
@@ -30,7 +30,7 @@ class QDown:
     def __init__(self, server_url="https://drive.qualiteg.com", quiet=False):
         """
         クライアントの初期化
-        
+
         Args:
             server_url (str): ファイルサーバーのベースURL
             quiet (bool): 進捗表示を非表示にするかどうか
@@ -38,91 +38,108 @@ class QDown:
         self.server_url = server_url.rstrip('/')
         self.quiet = quiet
         self.timeout = httpx.Timeout(10.0, connect=60.0)
-    
-    async def download(self, file_id, output=None, output_dir=None):
+
+    async def download_by_file_id(self, file_id, output=None, output_dir=None):
         """
         ファイルIDを指定してファイルをダウンロード
-        
+
         Args:
             file_id (str): ダウンロードするファイルのID (qd_id)
             output (str, optional): 出力ファイル名
             output_dir (str, optional): 出力ディレクトリ
-            
+
         Returns:
             str: ダウンロードしたファイルのパス
         """
         url = f"{self.server_url}/download/{file_id}"
-        
+
         # 出力ディレクトリの設定
         if output_dir:
             os.makedirs(output_dir, exist_ok=True)
         else:
             output_dir = "."
-            
+
         async with httpx.AsyncClient(timeout=self.timeout) as client:
             # まず、ヘッド要求を送信してファイル情報を取得
             try:
                 head_response = await client.head(url)
-                
+
                 if head_response.status_code == 404:
                     print(f"エラー: ID '{file_id}' のファイルが見つかりませんでした", file=sys.stderr)
                     return None
-                
+
                 if head_response.status_code != 200:
                     print(f"エラー: ステータスコード {head_response.status_code}", file=sys.stderr)
                     return None
-                
+
                 # Content-Dispositionヘッダーからファイル名を取得
                 original_filename = None
                 if "content-disposition" in head_response.headers:
                     cd = head_response.headers["content-disposition"]
                     if "filename=" in cd:
-                        original_filename = cd.split("filename=")[1].strip('"')
-                
+                        # 安全なファイル名を抽出（URLエンコードの解除）
+                        filename_part = cd.split("filename=")[1].strip('"')
+
+                        # filename*=UTF-8 形式のエンコードがある場合
+                        if "filename*=UTF-8''" in cd:
+                            encoded_part = cd.split("filename*=UTF-8''")[1]
+                            # セミコロンやダブルクォートがあれば処理
+                            if '"' in encoded_part:
+                                encoded_part = encoded_part.split('"')[0]
+                            if ';' in encoded_part:
+                                encoded_part = encoded_part.split(';')[0]
+                            # URLデコードして正しいファイル名を取得
+                            original_filename = urllib.parse.unquote(encoded_part)
+                        else:
+                            # 通常のファイル名（エスケープ処理）
+                            original_filename = filename_part.replace('"', '').split(';')[0]
+
                 # 保存用のファイル名を決定
                 if not output:
                     if original_filename:
-                        output_filename = original_filename
+                        # パスとして安全なファイル名に変換
+                        safe_filename = os.path.basename(original_filename)
+                        output_filename = safe_filename
                     else:
                         output_filename = f"download_{file_id}"
                 else:
                     output_filename = output
-                
+
                 file_path = os.path.join(output_dir, output_filename)
-                
+
                 # ファイルサイズを取得（プログレスバー用）
                 total_size = int(head_response.headers.get("content-length", 0))
-                
+
                 # ストリーミングダウンロードを開始
                 async with client.stream("GET", url) as response:
                     if response.status_code != 200:
                         print(f"エラー: ダウンロード中にエラーが発生しました。ステータスコード: {response.status_code}", file=sys.stderr)
                         return None
-                    
+
                     with open(file_path, "wb") as f:
                         if not self.quiet and total_size > 0:
                             progress_bar = tqdm(
-                                total=total_size, 
-                                unit="B", 
-                                unit_scale=True, 
+                                total=total_size,
+                                unit="B",
+                                unit_scale=True,
                                 desc=f"ダウンロード中: {output_filename}"
                             )
-                        
+
                         downloaded = 0
-                        
+
                         async for chunk in response.aiter_bytes():
                             f.write(chunk)
                             if not self.quiet and total_size > 0:
                                 downloaded += len(chunk)
                                 progress_bar.update(len(chunk))
-                        
+
                         if not self.quiet and total_size > 0:
                             progress_bar.close()
-                
+
                 if not self.quiet:
-                    print(f"\nファイルを保存しました: {file_path}")
+                    print(f"[qdown] ファイルを保存しました: {file_path}")
                 return file_path
-                
+
             except httpx.RequestError as e:
                 print(f"エラー: リクエストに失敗しました - {e}", file=sys.stderr)
                 return None
@@ -136,28 +153,28 @@ def main():
         description="qdown - IDベースファイルダウンロードツール",
         add_help=False
     )
-    
+
     parser.add_argument("id", nargs="?", help="ダウンロードするファイルのID")
     parser.add_argument("-O", dest="output", help="出力ファイル名")
     parser.add_argument("-o", dest="output_dir", help="出力ディレクトリ")
     parser.add_argument("-s", dest="server", default="https://drive.qualiteg.com", help="サーバーURL")
     parser.add_argument("-q", "--quiet", action="store_true", help="進捗表示を非表示")
     parser.add_argument("-h", "--help", action="store_true", help="ヘルプを表示")
-    
+
     args = parser.parse_args()
-    
+
     if args.help or not args.id:
         print(__doc__)
         sys.exit(0)
-    
+
     client = QDown(server_url=args.server, quiet=args.quiet)
-    
-    result = asyncio.run(client.download(
+
+    result = asyncio.run(client.download_by_file_id(
         file_id=args.id,
         output=args.output,
         output_dir=args.output_dir
     ))
-    
+
     if result:
         sys.exit(0)
     else:

qdown-1.0.3/qdown.egg-info/PKG-INFO

@@ -0,0 +1,68 @@
+Metadata-Version: 2.1
+Name: qdown
+Version: 1.0.3
+Summary: Client for QualitegDrive
+Home-page: https://github.com/qualiteg/qdown
+Author: Qualiteg Inc.
+Author-email: qualiteger@qualiteg.com
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+
+# qdown
+
+A Python client for downloading files from QualitegDrive operated by Qualiteg Inc.
+
+# install
+
+```
+pip install qdown
+```
+
+or 
+
+```
+pip install git+https://github.com/qualiteg/qdown.git
+```
+
+# usage
+
+```
+
+qdown ID [options]
+
+Options:
+-O FILENAME     Specify output filename
+-o DIR          Specify output directory
+-s SERVER       Specify server URL (default: https://drive.qualiteg.com)
+-q, --quiet     Hide progress display
+-h, --help      Display help
+```
+
+## download example1
+
+```
+qdown xxxxxxxxxxxxx -O my_file.txt
+```
+
+## download example2
+
+From Your Original HTTP Server
+
+```
+qdown xxxxxxxxxxxxx -O my_file.txt -s http://host.docker.internal:3000 
+```
+
+
+# uninstall
+
+```
+pip uninstall qdown -y
+```

{qdown-1.0.0 → qdown-1.0.3}/qdown.egg-info/SOURCES.txt

@@ -2,11 +2,12 @@ MANIFEST.in
 README.md
 setup.py
 qdown/__init__.py
-qdown/gdown.py
+qdown/qdown.py
 qdown.egg-info/PKG-INFO
 qdown.egg-info/SOURCES.txt
 qdown.egg-info/dependency_links.txt
 qdown.egg-info/entry_points.txt
 qdown.egg-info/requires.txt
 qdown.egg-info/top_level.txt
-z_examples/__init__.py
+z_examples/__init__.py
+z_examples/example.py

qdown-1.0.3/qdown.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+qdown = qdown.qdown:main

{qdown-1.0.0 → qdown-1.0.3}/setup.py

@@ -2,11 +2,18 @@
 # -*- coding: utf-8 -*-
 
 from setuptools import setup, find_packages
+import os
+
+# README.mdの内容を読み込む
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
 
 setup(
     name="qdown",
-    version="1.0.0",
+    version="1.0.3",  # バージョン更新
     description="Client for QualitegDrive",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     author="Qualiteg Inc.",
     author_email="qualiteger@qualiteg.com",
     url="https://github.com/qualiteg/qdown",
@@ -17,7 +24,7 @@ setup(
     ],
     entry_points={
         "console_scripts": [
-            "qdown=qdown.gdown:main",  # ファイル名をgdown.pyに修正
+            "qdown=qdown.qdown:main",
         ],
     },
     classifiers=[

qdown-1.0.3/z_examples/example.py

@@ -0,0 +1,4 @@
+import qdown
+
+# ファイル共有リンクからダウンロード
+file_path = qdown.download("https://drive.qualiteg.com/file/xxxxxx")

qdown-1.0.0/PKG-INFO

@@ -1,16 +0,0 @@
-Metadata-Version: 2.1
-Name: qdown
-Version: 1.0.0
-Summary: Client for QualitegDrive
-Home-page: https://github.com/qualiteg/qdown
-Author: Qualiteg Inc.
-Author-email: qualiteger@qualiteg.com
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.7

qdown-1.0.0/qdown/__init__.py

@@ -1,24 +0,0 @@
-"""
-
-Copyright (c) 2023 Qualiteg Inc. all rights reserved.
-
-This program is dual-licensed under the terms of the:
-1) GNU Affero General Public License, version 3, or any later version.
-2) A commercial license agreement provided by Qualiteg Inc.
-
-If you choose to use or redistribute this program under the terms of AGPLv3:
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-If you wish to use or redistribute this program under a commercial license:
-Please contact Qualiteg Inc.(https://qualiteg.com/contact) directly to obtain the terms and pricing.
-
-"""

qdown-1.0.0/qdown.egg-info/PKG-INFO

@@ -1,16 +0,0 @@
-Metadata-Version: 2.1
-Name: qdown
-Version: 1.0.0
-Summary: Client for QualitegDrive
-Home-page: https://github.com/qualiteg/qdown
-Author: Qualiteg Inc.
-Author-email: qualiteger@qualiteg.com
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.7

qdown-1.0.0/qdown.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-qdown = qdown.gdown:main