Merge pull request #2 from 7rs/develop

setup.pyとrequirements.txtの追加, README.mdへの記述

.gitignore

@@ -132,4 +132,5 @@ dmypy.json
 service/*
 thrift_setup.py
 test.py
-.env
+.env
+.pypirc

Pipfile

@@ -21,3 +21,4 @@ python_version = "3.8"
 [scripts]
 thrift = "python thrift_setup.py"
 test = "python test.py"
+requirements = "pip freeze > requirements.txt"

README.md

@@ -1 +1,24 @@
-# line4py
+# line4py
+
+## Installtion from [PyPI](https://pypi.org/project/line4py)
+
+`pip install line4py`
+
+## Installtion from [GitHub](https://github.com/7rs/line4py)
+
+`pip install git+ssh://[email protected]/7rs/line4py.git@master`
+
+## Usage
+
+```python
+from line4py import Client, ApplicationType
+
+client = Client(ApplicationType.ANDROIDLITE, concurrency=30, secondary=True)
+client.login_with_qrcode()
+```
+
+## Author
+
+[My Page](https://7rs.github.io)  
+[Twitter](https://twitter.com/R4XELN)  
+[Telegram](https://t.me/R4zLn)

line4py/__init__.py

@@ -2,8 +2,8 @@
 
 from loguru import logger
 
-from .service.TalkService.ttypes import ApplicationType
-from .client import Client
+from line4py.service.TalkService.ttypes import ApplicationType
+from line4py.client import Client
 
 log_format = "<blue>{time:%s}:{process}</blue> <cyan>{name}:{line}</cyan> <level>{level: <8} | {message}</level>" % (
     "YYYY-MM-DD-HH:mm:ss.SSS")

line4py/api/__init__.py

@@ -1,2 +1,2 @@
-from .talk import TalkServiceClient
-from .poll import LongPollingClient
+from line4py.api.talk import TalkServiceClient
+from line4py.api.poll import LongPollingClient

line4py/api/poll.py

@@ -1,7 +1,7 @@
 from typing import List, Dict, Callable
 
-from ..service.TalkService import TalkService
-from ..service.TalkService.ttypes import Operation, OpType
+from line4py.service.TalkService import TalkService
+from line4py.service.TalkService.ttypes import Operation, OpType
 
 _MAX_COUNT = 50
 

line4py/api/talk.py

@@ -1,7 +1,7 @@
 from typing import Dict, Optional
 
-from ..service.TalkService import TalkService
-from ..service.TalkService.ttypes import Message, MessageRelationType, ServiceCode
+from line4py.service.TalkService import TalkService
+from line4py.service.TalkService.ttypes import Message, MessageRelationType, ServiceCode
 
 
 class TalkServiceClient(TalkService.Client):

line4py/client.py

@@ -6,16 +6,16 @@
 from loguru import logger
 import axolotl_curve25519 as curve
 
-from .service.TalkService.ttypes import ApplicationType
-from .service.TalkService import TalkService
-from .service.SecondaryQrCodeLoginService.ttypes import (
+from line4py.service.TalkService.ttypes import ApplicationType
+from line4py.service.TalkService import TalkService
+from line4py.service.SecondaryQrCodeLoginService.ttypes import (
     CreateQrSessionRequest, CreateQrCodeRequest, VerifyCertificateRequest,
     CreatePinCodeRequest, QrCodeLoginRequest, QrCodeLoginResponse,
     SecondaryQrCodeException)
-from .service.SecondaryQrCodeLoginPermitNoticeService.ttypes import (
+from line4py.service.SecondaryQrCodeLoginPermitNoticeService.ttypes import (
     CheckQrCodeVerifiedRequest, CheckPinCodeVerifiedRequest)
-from .session import Session
-from .token import create_token
+from line4py.session import Session
+from line4py.token import create_token
 
 
 def create_message(*args):

line4py/config.py

@@ -1,6 +1,6 @@
 from typing import List, Dict, Optional
 
-from .service.TalkService.ttypes import ApplicationType
+from line4py.service.TalkService.ttypes import ApplicationType
 
 LEGY_HOST = "https://legy-jp-addr.line.naver.jp"
 OBS_HOST = "https://obs.line-apps.com"

line4py/service/AuthService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'AuthService']

line4py/service/BuddyService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'BuddyService']

line4py/service/CallService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'CallService']

line4py/service/ChannelService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'ChannelService']

line4py/service/PrimaryAccountInitService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'PrimaryAccountInitService']

line4py/service/SecondaryQrCodeLoginPermitNoticeService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'SecondaryQrCodeLoginPermitNoticeService']

line4py/service/SecondaryQrCodeLoginPermitService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'SecondaryQrCodeLoginPermitService']

line4py/service/SecondaryQrCodeLoginService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'SecondaryQrCodeLoginService']

line4py/service/ShopService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'ShopService']

line4py/service/TalkService/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'TalkService']

line4py/service/__init__.py

@@ -0,0 +1 @@
+

line4py/session.py

@@ -4,14 +4,15 @@
 from geventhttpclient import HTTPClient
 from geventhttpclient.url import URL
 
-from .service.TalkService.ttypes import ApplicationType
-from .service.TalkService import TalkService
-from .service.SecondaryQrCodeLoginService import SecondaryQrCodeLoginService
-from .service.SecondaryQrCodeLoginPermitNoticeService import SecondaryQrCodeLoginPermitNoticeService
-from .config import (HeaderBuilder, LEGY_HOST, TALK_SERVICE_V4, LONG_POLLING_V4,
-                     SECONDARY_LOGIN_REQUEST_V1, SECONDARY_LOGIN_CHECK_V1)
-from .thrift import THttpClient
-from .api import TalkServiceClient, LongPollingClient
+from line4py.service.TalkService.ttypes import ApplicationType
+from line4py.service.TalkService import TalkService
+from line4py.service.SecondaryQrCodeLoginService import SecondaryQrCodeLoginService
+from line4py.service.SecondaryQrCodeLoginPermitNoticeService import SecondaryQrCodeLoginPermitNoticeService
+from line4py.config import (HeaderBuilder, LEGY_HOST, TALK_SERVICE_V4,
+                            LONG_POLLING_V4, SECONDARY_LOGIN_REQUEST_V1,
+                            SECONDARY_LOGIN_CHECK_V1)
+from line4py.thrift import THttpClient
+from line4py.api import TalkServiceClient, LongPollingClient
 
 DEFAULT_TIMEOUT = 180.0
 

line4py/thrift.py

@@ -6,7 +6,7 @@
 from geventhttpclient.response import HTTPSocketPoolResponse
 from thrift.transport.TTransport import TTransportBase
 
-from .config import LONG_POLLING_V4_PATH
+from line4py.config import LONG_POLLING_V4_PATH
 
 
 class THttpClient(TTransportBase):

requirements.txt

@@ -0,0 +1,16 @@
+certifi==2020.4.5.1
+flake8==3.8.2
+gevent==20.5.2
+geventhttpclient==1.4.2
+greenlet==0.4.16
+loguru==0.5.0
+mccabe==0.6.1
+pycodestyle==2.6.0
+pyflakes==2.2.0
+python-axolotl-curve25519==0.4.1.post2
+python-dotenv==0.13.0
+six==1.15.0
+thrift==0.13.0
+yapf==0.30.0
+zope.event==4.4
+zope.interface==5.1.0

setup.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+from setuptools import setup, find_packages
+from typing import List
+
+
+def install_requires() -> List[str]:
+    with open("./requirements.txt", "r") as f:
+        return f.read().split("\n")
+
+
+setup(name="line4py",
+      version="1.0.0",
+      license="MIT",
+      description="LINE's library for Python",
+      author="R4zL",
+      url="https://github.com/7rs/line4py",
+      install_requires=install_requires(),
+      packages=find_packages(exclude=('example')))