[WIP] てきとーに機能追加

deploy.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# register
+# python setup.py register
+# https://pypi.python.org/pypi?%3Aaction=submit_form
+
+python setup.py check -r -s
+python setup.py sdist bdist_wheel
+
+twine upload dist/*

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='dmm-search',
-    version='1.0.1',
+    version='1.1.0',
     description="DMM search API for Python",
     py_modules=['dmm'],
     package_dir={'': 'src'},

src/dmm.py

@@ -1,32 +1,46 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+from urllib.parse import urljoin
 import requests
-import time
-import json
+
 
 class DMM:
     def __init__(self, api_id, affiliate_id):
-        self.baseurl = 'https://api.dmm.com/affiliate/v3'
+        self.base_url = 'https://api.dmm.com/affiliate/v3/'
 
         # required parameters
-        self.api_id       = api_id
+        self.api_id = api_id
         self.affiliate_id = affiliate_id
-        self.site         = 'DMM.R18'
+        self.site = 'DMM.R18'
+
+    def __get(self, endpoint, params):
+        url = urljoin(self.base_url, endpoint)
+        return requests.get(url, params=params).json()
+
+    def itemList(self, **params):
+        params['api_id'] = self.api_id
+        params['affiliate_id'] = self.affiliate_id
+
+        params['site'] = 'DMM.R18'
+
+        return self.__get('itemList', params)
 
-    def search(self, keyword, hits=10, offset=1, sort='rank'):
-        url = self.baseurl + '/itemList'
+    def floorList():
+        pass
 
-        params = {
-            'api_id':       self.api_id,
-            'affiliate_id': self.affiliate_id,
-            'site':         self.site,
-            'keyword':      keyword,
-            'hits':         hits,
-            'offset':       offset,
-            'sort':         sort
-        }
+    def actressSearch():
+        pass
 
-        return requests.get(url, params).json()
+    def genreSearch():
+        pass
+
+    def makerSearch():
+        pass
+
+    def seriesSearch():
+        pass
+
+    def authorSearch():
+        pass
 
 if __name__ == '__main__':
     import sys
@@ -35,9 +49,8 @@ def search(self, keyword, hits=10, offset=1, sort='rank'):
     query = sys.argv[3]
 
     dmm = DMM(api_id, affiliate_id)
-    items = dmm.search(query, hits=16, offset=1, sort='date')
+    items = dmm.itemList(keyword=query, hits=16, offset=1, sort='date')
 
     for item in items['result']['items']:
         print(item['title'])
         print([genre['name'] for genre in item['iteminfo']['genre']])
-

tests/test_dmm.py

@@ -1,5 +1,6 @@
 from unittest import TestCase
 from nose.tools import ok_, eq_
+
 import dmm
 
 class TestDMM(TestCase):