refactor: Delete not needed python files

requirements.txt

@@ -1,6 +0,0 @@
-aiohttp
-yarl
-pillow
-telethon
-cryptg
-python-magic

setup.py

@@ -1,54 +0,0 @@
-import setuptools
-
-from sticker.get_version import git_tag, git_revision, version, linkified_version
-
-with open("requirements.txt") as reqs:
-    install_requires = reqs.read().splitlines()
-
-try:
-    long_desc = open("README.md").read()
-except IOError:
-    long_desc = "Failed to read README.md"
-
-with open("sticker/version.py", "w") as version_file:
-    version_file.write(f"""# Generated in setup.py
-
-git_tag = {git_tag!r}
-git_revision = {git_revision!r}
-version = {version!r}
-linkified_version = {linkified_version!r}
-""")
-
-setuptools.setup(
-    name="maunium-stickerpicker",
-    version=version,
-    url="https://github.com/maunium/stickerpicker",
-
-    author="Tulir Asokan",
-    author_email="tulir@maunium.net",
-
-    description="A fast and simple Matrix sticker picker widget",
-    long_description=long_desc,
-    long_description_content_type="text/markdown",
-
-    packages=setuptools.find_packages(),
-
-    install_requires=install_requires,
-    python_requires="~=3.6",
-
-    classifiers=[
-        "Development Status :: 4 - Beta",
-        "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
-        "Framework :: AsyncIO",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-    ],
-    entry_points={"console_scripts": [
-        "sticker-import=sticker.stickerimport:cmd",
-        "sticker-pack=sticker.pack:cmd",
-    ]},
-)

sticker/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.1.0+dev"
-__author__ = "Tulir Asokan <tulir@maunium.net>"

sticker/get_version.py

@@ -1,50 +0,0 @@
-import subprocess
-import shutil
-import os
-
-from . import __version__
-
-cmd_env = {
-    "PATH": os.environ["PATH"],
-    "HOME": os.environ["HOME"],
-    "LANG": "C",
-    "LC_ALL": "C",
-}
-
-
-def run(cmd):
-    return subprocess.check_output(cmd, stderr=subprocess.DEVNULL, env=cmd_env)
-
-
-if (os.path.exists("../.git") or os.path.exists(".git")) and shutil.which("git"):
-    try:
-        git_revision = run(["git", "rev-parse", "HEAD"]).strip().decode("ascii")
-        git_revision_url = f"https://github.com/maunium/stickerpicker/commit/{git_revision}"
-        git_revision = git_revision[:8]
-    except (subprocess.SubprocessError, OSError):
-        git_revision = "unknown"
-        git_revision_url = None
-
-    try:
-        git_tag = run(["git", "describe", "--exact-match", "--tags"]).strip().decode("ascii")
-    except (subprocess.SubprocessError, OSError):
-        git_tag = None
-else:
-    git_revision = "unknown"
-    git_revision_url = None
-    git_tag = None
-
-git_tag_url = (f"https://github.com/maunium/stickerpicker/releases/tag/{git_tag}"
-               if git_tag else None)
-
-if git_tag and __version__ == git_tag[1:].replace("-", ""):
-    version = __version__
-    linkified_version = f"[{version}]({git_tag_url})"
-else:
-    if not __version__.endswith("+dev"):
-        __version__ += "+dev"
-    version = f"{__version__}.{git_revision}"
-    if git_revision_url:
-        linkified_version = f"{__version__}.[{git_revision}]({git_revision_url})"
-    else:
-        linkified_version = version

sticker/lib/matrix.py

@@ -1,90 +0,0 @@
-# maunium-stickerpicker - A fast and simple Matrix sticker picker widget.
-# Copyright (C) 2020 Tulir Asokan
-#
-# 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/>.
-from typing import Optional, TYPE_CHECKING
-import json
-
-from aiohttp import ClientSession
-from yarl import URL
-
-access_token: Optional[str] = None
-homeserver_url: Optional[str] = None
-
-upload_url: Optional[URL] = None
-
-if TYPE_CHECKING:
-    from typing import TypedDict
-
-
-    class MediaInfo(TypedDict):
-        w: int
-        h: int
-        size: int
-        mimetype: str
-        thumbnail_url: Optional[str]
-        thumbnail_info: Optional['MediaInfo']
-
-
-    class StickerInfo(TypedDict, total=False):
-        body: str
-        url: str
-        info: MediaInfo
-        id: str
-        msgtype: str
-else:
-    MediaInfo = None
-    StickerInfo = None
-
-
-async def load_config(path: str) -> None:
-    global access_token, homeserver_url, upload_url
-    try:
-        with open(path) as config_file:
-            config = json.load(config_file)
-            homeserver_url = config["homeserver"]
-            access_token = config["access_token"]
-    except FileNotFoundError:
-        print("Matrix config file not found. Please enter your homeserver and access token.")
-        homeserver_url = input("Homeserver URL: ")
-        access_token = input("Access token: ")
-        whoami_url = URL(homeserver_url) / "_matrix" / "client" / "r0" / "account" / "whoami"
-        if whoami_url.scheme not in ("https", "http"):
-            whoami_url = whoami_url.with_scheme("https")
-        user_id = await whoami(whoami_url, access_token)
-        with open(path, "w") as config_file:
-            json.dump({
-                "homeserver": homeserver_url,
-                "user_id": user_id,
-                "access_token": access_token
-            }, config_file)
-        print(f"Wrote config to {path}")
-
-    upload_url = URL(homeserver_url) / "_matrix" / "media" / "r0" / "upload"
-
-
-async def whoami(url: URL, access_token: str) -> str:
-    headers = {"Authorization": f"Bearer {access_token}"}
-    async with ClientSession() as sess, sess.get(url, headers=headers) as resp:
-        resp.raise_for_status()
-        user_id = (await resp.json())["user_id"]
-        print(f"Access token validated (user ID: {user_id})")
-        return user_id
-
-
-async def upload(data: bytes, mimetype: str, filename: str) -> str:
-    url = upload_url.with_query({"filename": filename})
-    headers = {"Content-Type": mimetype, "Authorization": f"Bearer {access_token}"}
-    async with ClientSession() as sess, sess.post(url, data=data, headers=headers) as resp:
-        return (await resp.json())["content_uri"]

sticker/lib/util.py

@@ -1,80 +0,0 @@
-# maunium-stickerpicker - A fast and simple Matrix sticker picker widget.
-# Copyright (C) 2020 Tulir Asokan
-#
-# 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/>.
-from functools import partial
-from io import BytesIO
-import os.path
-import json
-
-from PIL import Image
-
-from . import matrix
-
-open_utf8 = partial(open, encoding='UTF-8')
-
-def convert_image(data: bytes) -> (bytes, int, int):
-    image: Image.Image = Image.open(BytesIO(data)).convert("RGBA")
-    new_file = BytesIO()
-    image.save(new_file, "png")
-    w, h = image.size
-    if w > 256 or h > 256:
-        # Set the width and height to lower values so clients wouldn't show them as huge images
-        if w > h:
-            h = int(h / (w / 256))
-            w = 256
-        else:
-            w = int(w / (h / 256))
-            h = 256
-    return new_file.getvalue(), w, h
-
-
-def add_to_index(name: str, output_dir: str) -> None:
-    index_path = os.path.join(output_dir, "index.json")
-    try:
-        with open_utf8(index_path) as index_file:
-            index_data = json.load(index_file)
-    except (FileNotFoundError, json.JSONDecodeError):
-        index_data = {"packs": []}
-    if "homeserver_url" not in index_data and matrix.homeserver_url:
-        index_data["homeserver_url"] = matrix.homeserver_url
-    if name not in index_data["packs"]:
-        index_data["packs"].append(name)
-        with open_utf8(index_path, "w") as index_file:
-            json.dump(index_data, index_file, indent="  ")
-        print(f"Added {name} to {index_path}")
-
-
-def make_sticker(mxc: str, width: int, height: int, size: int,
-                 body: str = "") -> matrix.StickerInfo:
-    return {
-        "body": body,
-        "url": mxc,
-        "info": {
-            "w": width,
-            "h": height,
-            "size": size,
-            "mimetype": "image/png",
-
-            # Element iOS compatibility hack
-            "thumbnail_url": mxc,
-            "thumbnail_info": {
-                "w": width,
-                "h": height,
-                "size": size,
-                "mimetype": "image/png",
-            },
-        },
-        "msgtype": "m.sticker",
-    }

sticker/pack.py

@@ -1,145 +0,0 @@
-# maunium-stickerpicker - A fast and simple Matrix sticker picker widget.
-# Copyright (C) 2020 Tulir Asokan
-#
-# 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/>.
-from typing import Dict, Optional
-from hashlib import sha256
-import mimetypes
-import argparse
-import os.path
-import asyncio
-import string
-import json
-
-try:
-    import magic
-except ImportError:
-    print("[Warning] Magic is not installed, using file extensions to guess mime types")
-    magic = None
-
-from .lib import matrix, util
-
-
-def convert_name(name: str) -> str:
-    name_translate = {
-        ord(" "): ord("_"),
-    }
-    allowed_chars = string.ascii_letters + string.digits + "_-/.#"
-    return "".join(filter(lambda char: char in allowed_chars, name.translate(name_translate)))
-
-
-async def upload_sticker(file: str, directory: str, old_stickers: Dict[str, matrix.StickerInfo]
-                         ) -> Optional[matrix.StickerInfo]:
-    if file.startswith("."):
-        return None
-    path = os.path.join(directory, file)
-    if not os.path.isfile(path):
-        return None
-
-    if magic:
-        mime = magic.from_file(path, mime=True)
-    else:
-        mime, _ = mimetypes.guess_type(file)
-    if not mime.startswith("image/"):
-        return None
-
-    print(f"Processing {file}", end="", flush=True)
-    try:
-        with open(path, "rb") as image_file:
-            image_data = image_file.read()
-    except Exception as e:
-        print(f"... failed to read file: {e}")
-        return None
-    name = os.path.splitext(file)[0]
-
-    # If the name starts with "number-", remove the prefix
-    name_split = name.split("-", 1)
-    if len(name_split) == 2 and name_split[0].isdecimal():
-        name = name_split[1]
-
-    sticker_id = f"sha256:{sha256(image_data).hexdigest()}"
-    print(".", end="", flush=True)
-    if sticker_id in old_stickers:
-        sticker = {
-            **old_stickers[sticker_id],
-            "body": name,
-        }
-        print(f".. using existing upload")
-    else:
-        image_data, width, height = util.convert_image(image_data)
-        print(".", end="", flush=True)
-        mxc = await matrix.upload(image_data, "image/png", file)
-        print(".", end="", flush=True)
-        sticker = util.make_sticker(mxc, width, height, len(image_data), name)
-        sticker["id"] = sticker_id
-        print(" uploaded", flush=True)
-    return sticker
-
-
-async def main(args: argparse.Namespace) -> None:
-    await matrix.load_config(args.config)
-
-    dirname = os.path.basename(os.path.abspath(args.path))
-    meta_path = os.path.join(args.path, "pack.json")
-    try:
-        with util.open_utf8(meta_path) as pack_file:
-            pack = json.load(pack_file)
-            print(f"Loaded existing pack meta from {meta_path}")
-    except FileNotFoundError:
-        pack = {
-            "title": args.title or dirname,
-            "id": args.id or convert_name(dirname),
-            "stickers": [],
-        }
-        old_stickers = {}
-    else:
-        old_stickers = {sticker["id"]: sticker for sticker in pack["stickers"]}
-        pack["stickers"] = []
-
-    for file in sorted(os.listdir(args.path)):
-        sticker = await upload_sticker(file, args.path, old_stickers=old_stickers)
-        if sticker:
-            pack["stickers"].append(sticker)
-
-    with util.open_utf8(meta_path, "w") as pack_file:
-        json.dump(pack, pack_file)
-    print(f"Wrote pack to {meta_path}")
-
-    if args.add_to_index:
-        picker_file_name = f"{pack['id']}.json"
-        picker_pack_path = os.path.join(args.add_to_index, picker_file_name)
-        with util.open_utf8(picker_pack_path, "w") as pack_file:
-            json.dump(pack, pack_file)
-        print(f"Copied pack to {picker_pack_path}")
-        util.add_to_index(picker_file_name, args.add_to_index)
-
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--config",
-                    help="Path to JSON file with Matrix homeserver and access_token",
-                    type=str, default="config.json", metavar="file")
-parser.add_argument("--title", help="Override the sticker pack displayname", type=str,
-                    metavar="title")
-parser.add_argument("--id", help="Override the sticker pack ID", type=str, metavar="id")
-parser.add_argument("--add-to-index", help="Sticker picker pack directory (usually 'web/packs/')",
-                    type=str, metavar="path")
-parser.add_argument("path", help="Path to the sticker pack directory", type=str)
-
-
-def cmd():
-    asyncio.get_event_loop().run_until_complete(main(parser.parse_args()))
-
-
-if __name__ == "__main__":
-    cmd()

sticker/scalar_convert.py

@@ -1,56 +0,0 @@
-# maunium-stickerpicker - A fast and simple Matrix sticker picker widget.
-# Copyright (C) 2020 Tulir Asokan
-#
-# 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/>.
-import sys
-import json
-
-index_path = "../web/packs/index.json"
-
-try:
-    with util.open_utf8(index_path) as index_file:
-        index_data = json.load(index_file)
-except (FileNotFoundError, json.JSONDecodeError):
-    index_data = {"packs": []}
-
-with util.open_utf8(sys.argv[-1]) as file:
-    data = json.load(file)
-
-for pack in data["assets"]:
-    title = pack["name"].title()
-    if "images" not in pack["data"]:
-        print(f"Skipping {title}")
-        continue
-    pack_id = f"scalar-{pack['asset_id']}"
-    stickers = []
-    for sticker in pack["data"]["images"]:
-        sticker_data = sticker["content"]
-        sticker_data["id"] = sticker_data["url"].split("/")[-1]
-        stickers.append(sticker_data)
-    pack_data = {
-        "title": title,
-        "id": pack_id,
-        "stickers": stickers,
-    }
-    filename = f"scalar-{pack['name'].replace(' ', '_')}.json"
-    pack_path = f"web/packs/{filename}"
-    with util.open_utf8(pack_path, "w") as pack_file:
-        json.dump(pack_data, pack_file)
-    print(f"Wrote {title} to {pack_path}")
-    if filename not in index_data["packs"]:
-        index_data["packs"].append(filename)
-
-with util.open_utf8(index_path, "w") as index_file:
-    json.dump(index_data, index_file, indent="  ")
-print(f"Updated {index_path}")

sticker/stickerimport.py

@@ -1,169 +0,0 @@
-# maunium-stickerpicker - A fast and simple Matrix sticker picker widget.
-# Copyright (C) 2020 Tulir Asokan
-#
-# 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/>.
-from typing import Dict
-import argparse
-import asyncio
-import os.path
-import json
-import re
-
-from telethon import TelegramClient
-from telethon.tl.functions.messages import GetAllStickersRequest, GetStickerSetRequest
-from telethon.tl.types.messages import AllStickers
-from telethon.tl.types import InputStickerSetShortName, Document, DocumentAttributeSticker
-from telethon.tl.types.messages import StickerSet as StickerSetFull
-
-from .lib import matrix, util
-
-
-async def reupload_document(client: TelegramClient, document: Document) -> matrix.StickerInfo:
-    print(f"Reuploading {document.id}", end="", flush=True)
-    data = await client.download_media(document, file=bytes)
-    print(".", end="", flush=True)
-    data, width, height = util.convert_image(data)
-    print(".", end="", flush=True)
-    mxc = await matrix.upload(data, "image/png", f"{document.id}.png")
-    print(".", flush=True)
-    return util.make_sticker(mxc, width, height, len(data))
-
-
-def add_meta(document: Document, info: matrix.StickerInfo, pack: StickerSetFull) -> None:
-    for attr in document.attributes:
-        if isinstance(attr, DocumentAttributeSticker):
-            info["body"] = attr.alt
-    info["id"] = f"tg-{document.id}"
-    info["net.maunium.telegram.sticker"] = {
-        "pack": {
-            "id": str(pack.set.id),
-            "short_name": pack.set.short_name,
-        },
-        "id": str(document.id),
-        "emoticons": [],
-    }
-
-
-async def reupload_pack(client: TelegramClient, pack: StickerSetFull, output_dir: str) -> None:
-    if pack.set.animated:
-        print("Animated stickerpacks are currently not supported")
-        return
-
-    pack_path = os.path.join(output_dir, f"{pack.set.short_name}.json")
-    try:
-        os.mkdir(os.path.dirname(pack_path))
-    except FileExistsError:
-        pass
-
-    print(f"Reuploading {pack.set.title} with {pack.set.count} stickers "
-          f"and writing output to {pack_path}")
-
-    already_uploaded = {}
-    try:
-        with util.open_utf8(pack_path) as pack_file:
-            existing_pack = json.load(pack_file)
-            already_uploaded = {int(sticker["net.maunium.telegram.sticker"]["id"]): sticker
-                                for sticker in existing_pack["stickers"]}
-            print(f"Found {len(already_uploaded)} already reuploaded stickers")
-    except FileNotFoundError:
-        pass
-
-    reuploaded_documents: Dict[int, matrix.StickerInfo] = {}
-    for document in pack.documents:
-        try:
-            reuploaded_documents[document.id] = already_uploaded[document.id]
-            print(f"Skipped reuploading {document.id}")
-        except KeyError:
-            reuploaded_documents[document.id] = await reupload_document(client, document)
-        # Always ensure the body and telegram metadata is correct
-        add_meta(document, reuploaded_documents[document.id], pack)
-
-    for sticker in pack.packs:
-        if not sticker.emoticon:
-            continue
-        for document_id in sticker.documents:
-            doc = reuploaded_documents[document_id]
-            # If there was no sticker metadata, use the first emoji we find
-            if doc["body"] == "":
-                doc["body"] = sticker.emoticon
-            doc["net.maunium.telegram.sticker"]["emoticons"].append(sticker.emoticon)
-
-    with util.open_utf8(pack_path, "w") as pack_file:
-        json.dump({
-            "title": pack.set.title,
-            "id": f"tg-{pack.set.id}",
-            "net.maunium.telegram.pack": {
-                "short_name": pack.set.short_name,
-                "hash": str(pack.set.hash),
-            },
-            "stickers": list(reuploaded_documents.values()),
-        }, pack_file, ensure_ascii=False)
-    print(f"Saved {pack.set.title} as {pack.set.short_name}.json")
-
-    util.add_to_index(os.path.basename(pack_path), output_dir)
-
-
-pack_url_regex = re.compile(r"^(?:(?:https?://)?(?:t|telegram)\.(?:me|dog)/addstickers/)?"
-                            r"([A-Za-z0-9-_]+)"
-                            r"(?:\.json)?$")
-
-parser = argparse.ArgumentParser()
-
-parser.add_argument("--list", help="List your saved sticker packs", action="store_true")
-parser.add_argument("--session", help="Telethon session file name", default="sticker-import")
-parser.add_argument("--config",
-                    help="Path to JSON file with Matrix homeserver and access_token",
-                    type=str, default="config.json")
-parser.add_argument("--output-dir", help="Directory to write packs to", default="web/packs/",
-                    type=str)
-parser.add_argument("pack", help="Sticker pack URLs to import", action="append", nargs="*")
-
-
-async def main(args: argparse.Namespace) -> None:
-    await matrix.load_config(args.config)
-    client = TelegramClient(args.session, 298751, "cb676d6bae20553c9996996a8f52b4d7")
-    await client.start()
-
-    if args.list:
-        stickers: AllStickers = await client(GetAllStickersRequest(hash=0))
-        index = 1
-        width = len(str(len(stickers.sets)))
-        print("Your saved sticker packs:")
-        for saved_pack in stickers.sets:
-            print(f"{index:>{width}}. {saved_pack.title} "
-                  f"(t.me/addstickers/{saved_pack.short_name})")
-            index += 1
-    elif args.pack[0]:
-        input_packs = []
-        for pack_url in args.pack[0]:
-            match = pack_url_regex.match(pack_url)
-            if not match:
-                print(f"'{pack_url}' doesn't look like a sticker pack URL")
-                return
-            input_packs.append(InputStickerSetShortName(short_name=match.group(1)))
-        for input_pack in input_packs:
-            pack: StickerSetFull = await client(GetStickerSetRequest(input_pack, hash=0))
-            await reupload_pack(client, pack, args.output_dir)
-    else:
-        parser.print_help()
-
-    await client.disconnect()
-
-
-def cmd() -> None:
-    asyncio.get_event_loop().run_until_complete(main(parser.parse_args()))
-
-
-if __name__ == "__main__":
-    cmd()

sticker/version.py

@@ -1 +0,0 @@
-from .get_version import git_tag, git_revision, version, linkified_version