begin real 0.1.0

Author: AbstractUmbra

.gitignore

@@ -1,6 +1,8 @@
 .vscode/
+__ignore__/
 *.pyc
 __pycache__/
 /dist/
 /*.egg-info/
+.mypy_cache/
 setup.py

README.md

@@ -4,6 +4,14 @@ A small simple wrapper around the [Mystb.in](https://mystb.in/) API.
 
 ### Features
 
-[x] - `POST`ing to the API, which will return the provided url.\
-[x] - `GET`ting from the API, provided you know the URL or ID. \
-[ ] - Authorization. Awaiting the API making this public as it is still WIP.
+[x] - `POST`ing to the API, which will return the provided url. \
+[x] - `GET`ting from the API, provided you know the URL or paste ID. \
+[ ] - Ability to pass in a sync or async session / parameter so it is flexible.
+
+[ ] - Write a real underlying Client for this, it will be required for... \
+[ ] - Authorization. Awaiting the API making this public as it is still WIP. \
+
+### Dependencies
+
+`aiohttp` - required
+`requests` - optional

mystbin/__init__.py

@@ -21,37 +21,6 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
-import re
 
-import aiohttp
-
-BASE = "https://mystb.in/api/pastes"
-# Let's set aiohttp timeout for this
-TIMEOUT = aiohttp.ClientTimeout(total=15.0)
-
-# grab the paste id: https://regex101.com/r/qkluDh/1
-MB_URL_RE = re.compile(r"(?:http[s]?://mystb\.in/)?([a-zA-Z]+)(?:.*)")
-
-async def post(content: str, *, session: aiohttp.ClientSession = None, suffix: str = None) -> str:
-    """ Post `content` to MystB.in with optional suffix text. """
-    suffix = f".{suffix}" if suffix else ""
-    multi_part = aiohttp.MultipartWriter()
-    paste_content = multi_part.append(content)
-    paste_content.set_content_disposition("form-data", name="data")
-    paste_content = multi_part.append_json({"meta": [{"index": 0, "syntax": suffix}]})
-    paste_content.set_content_disposition("form-data", name="meta")
-    session = session or aiohttp.ClientSession(raise_for_status=True)
-    async with session.post(BASE, data=multi_part, timeout=TIMEOUT) as mb_res:
-        url = await mb_res.json()
-    short_id = url['pastes'][0]['id']
-    return f"https://mystb.in/{short_id}{suffix}"
-
-async def get(paste: str, *, session: aiohttp.ClientSession = None) -> dict:
-    try:
-        paste_id = MB_URL_RE.match(paste)[1]
-    except IndexError:
-        return "This is not a valid Mystb.in paste ID or URL."
-    session = session or aiohttp.ClientSession(raise_for_status=True)
-    async with session.get(f"{BASE}/{paste_id}", timeout=TIMEOUT) as mb_res:
-        data_json = await mb_res.json()
-    return data_json
+from .client import MystClient
+from .errors import *

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mystbin.py"
-version = "0.0.1"
+version = "0.1.0"
 description = "A small simple wrapper around the mystb.in API."
 authors = ["AbstractUmbra <Umbra@AbstractUmbra.xyz>"]
 license = "MIT"
@@ -24,10 +24,16 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.6"
 aiohttp = "^3.6.2"
+requests = {version = "^2.24.0", optional = true}
 
 [tool.poetry.dev-dependencies]
 setuptools = "^50.3.0"
 wheel = "^0.35.1"
+autopep8 = "^1.5.4"
+mypy = "^0.782"
+
+[tool.poetry.extras]
+requests = ["requests"]
 
 [build-system]
 requires = ["poetry>=0.12"]