From c6348ab8fa6efbc93a6f3e17638bcfb4700182cf Mon Sep 17 00:00:00 2001 From: Sergio Abad Date: Wed, 25 Nov 2020 15:39:47 +0100 Subject: [PATCH] Solved install issue --- README.md | 6 +++--- aliexpress.py => aliexpress/api.py | 14 +++++++++----- {top => aliexpress/top}/__init__.py | 2 +- aliexpress/top/api/__init__.py | 2 ++ {top => aliexpress/top}/api/base.py | 10 +++++----- .../rest/AliexpressAffiliateCategoryGetRequest.py | 2 +- .../AliexpressAffiliateFeaturedpromoGetRequest.py | 2 +- ...ressAffiliateFeaturedpromoProductsGetRequest.py | 2 +- .../rest/AliexpressAffiliateLinkGenerateRequest.py | 2 +- .../api/rest/AliexpressAffiliateOrderGetRequest.py | 2 +- .../rest/AliexpressAffiliateOrderListRequest.py | 2 +- .../rest/AliexpressAffiliateProductQueryRequest.py | 2 +- .../AliexpressAffiliateProductdetailGetRequest.py | 2 +- aliexpress/top/api/rest/__init__.py | 8 ++++++++ setup.py | 2 +- top/api/__init__.py | 2 -- top/api/rest/__init__.py | 8 -------- 17 files changed, 37 insertions(+), 33 deletions(-) rename aliexpress.py => aliexpress/api.py (90%) rename {top => aliexpress/top}/__init__.py (90%) create mode 100644 aliexpress/top/api/__init__.py rename {top => aliexpress/top}/api/base.py (97%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateCategoryGetRequest.py (86%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateFeaturedpromoGetRequest.py (87%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateFeaturedpromoProductsGetRequest.py (93%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateLinkGenerateRequest.py (89%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateOrderGetRequest.py (88%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateOrderListRequest.py (91%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateProductQueryRequest.py (93%) rename {top => aliexpress/top}/api/rest/AliexpressAffiliateProductdetailGetRequest.py (90%) create mode 100644 aliexpress/top/api/rest/__init__.py delete mode 100644 top/api/__init__.py delete mode 100644 top/api/rest/__init__.py diff --git a/README.md b/README.md index 77dc61c..b0c9579 100644 --- a/README.md +++ b/README.md @@ -29,21 +29,21 @@ Usage guide ----------- **Get product information:** - from aliexpress import Aliexpress + from aliexpress.api import Aliexpress aliexpress = Aliexpress(KEY, SECRET, 'ES', 'EUR', TRACKING_ID) product = aliexpress.product_info('1000006468625') print(product.product_title) **Get affiliate link:** - from aliexpress import Aliexpress + from aliexpress.api import Aliexpress aliexpress = Aliexpress(KEY, SECRET, 'EN', 'USD', TRACKING_ID) url = aliexpress.affiliate_link('https://aliexpress.com/item/1000006468625.html') Changelog ------------- - Version 1.0.1 + Version 1.0.2 -First release. License diff --git a/aliexpress.py b/aliexpress/api.py similarity index 90% rename from aliexpress.py rename to aliexpress/api.py index 88a98d8..27d9d22 100644 --- a/aliexpress.py +++ b/aliexpress/api.py @@ -5,7 +5,7 @@ API in an easier way. """ -import top.api +import aliexpress.top.api import json from types import SimpleNamespace @@ -26,7 +26,11 @@ def __str__(self): def get_product_id(text): """Returns product ID for a given link.""" product_id = text.split('?')[0] - product_id = product_id.replace('.', '/').split('/')[-2] + product_id = product_id.replace('.', '/').split('/') + if len(product_id) == 1: + product_id = product_id[0] + else: + product_id = product_id[-2] try: return int(product_id) except ValueError: @@ -49,7 +53,7 @@ def __init__(self, key: str, secret: str, language='EN', currency='USD', trackin self.tracking_id = tracking_id self.language = language self.currency = currency - top.setDefaultAppInfo(self.key, self.secret) + aliexpress.top.setDefaultAppInfo(self.key, self.secret) def product_info(self, product_id: str): """Find product information for a specific product on AliExpress. @@ -59,7 +63,7 @@ def product_info(self, product_id: str): """ product_id = get_product_id(str(product_id)) if product_id: - product = top.api.rest.AliexpressAffiliateProductdetailGetRequest() + product = aliexpress.top.api.rest.AliexpressAffiliateProductdetailGetRequest() product.app_signature = None product.fields = None product.product_ids = product_id @@ -92,7 +96,7 @@ def affiliate_link(self, link: str): link (str): The URL that needs to be converted. """ if self.tracking_id: - affiliate = top.api.rest.AliexpressAffiliateLinkGenerateRequest() + affiliate = aliexpress.top.api.rest.AliexpressAffiliateLinkGenerateRequest() affiliate.source_values = link affiliate.promotion_link_type = "0" affiliate.tracking_id = self.tracking_id diff --git a/top/__init__.py b/aliexpress/top/__init__.py similarity index 90% rename from top/__init__.py rename to aliexpress/top/__init__.py index 12291e9..5611bd3 100644 --- a/top/__init__.py +++ b/aliexpress/top/__init__.py @@ -3,7 +3,7 @@ @author: lihao ''' -from top.api.base import sign +from aliexpress.top.api.base import sign diff --git a/aliexpress/top/api/__init__.py b/aliexpress/top/api/__init__.py new file mode 100644 index 0000000..c63d6a0 --- /dev/null +++ b/aliexpress/top/api/__init__.py @@ -0,0 +1,2 @@ +from aliexpress.top.api.rest import * +from aliexpress.top.api.base import FileItem \ No newline at end of file diff --git a/top/api/base.py b/aliexpress/top/api/base.py similarity index 97% rename from top/api/base.py rename to aliexpress/top/api/base.py index 9c022f1..9760049 100644 --- a/top/api/base.py +++ b/aliexpress/top/api/base.py @@ -12,7 +12,7 @@ import time import hashlib import json -import top +import aliexpress.top import itertools import mimetypes @@ -180,9 +180,9 @@ def __init__(self, domain='gw.api.taobao.com', port = 80): self.__domain = domain self.__port = port self.__httpmethod = "POST" - if(top.getDefaultAppInfo()): - self.__app_key = top.getDefaultAppInfo().appkey - self.__secret = top.getDefaultAppInfo().secret + if(aliexpress.top.getDefaultAppInfo()): + self.__app_key = aliexpress.top.getDefaultAppInfo().appkey + self.__secret = aliexpress.top.getDefaultAppInfo().secret def get_request_header(self): return { @@ -195,7 +195,7 @@ def set_app_info(self, appinfo): #======================================================================= # 设置请求的app信息 # @param appinfo: import top - # appinfo top.appinfo(appkey,secret) + # appinfo aliexpress.top.appinfo(appkey,secret) #======================================================================= self.__app_key = appinfo.appkey self.__secret = appinfo.secret diff --git a/top/api/rest/AliexpressAffiliateCategoryGetRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateCategoryGetRequest.py similarity index 86% rename from top/api/rest/AliexpressAffiliateCategoryGetRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateCategoryGetRequest.py index 3d76dab..bd331c0 100644 --- a/top/api/rest/AliexpressAffiliateCategoryGetRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateCategoryGetRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.03.09 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateCategoryGetRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/top/api/rest/AliexpressAffiliateFeaturedpromoGetRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateFeaturedpromoGetRequest.py similarity index 87% rename from top/api/rest/AliexpressAffiliateFeaturedpromoGetRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateFeaturedpromoGetRequest.py index ea1dbda..49e5402 100644 --- a/top/api/rest/AliexpressAffiliateFeaturedpromoGetRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateFeaturedpromoGetRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.06.02 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateFeaturedpromoGetRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/top/api/rest/AliexpressAffiliateFeaturedpromoProductsGetRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateFeaturedpromoProductsGetRequest.py similarity index 93% rename from top/api/rest/AliexpressAffiliateFeaturedpromoProductsGetRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateFeaturedpromoProductsGetRequest.py index fa453da..97448fb 100644 --- a/top/api/rest/AliexpressAffiliateFeaturedpromoProductsGetRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateFeaturedpromoProductsGetRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.06.08 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateFeaturedpromoProductsGetRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/top/api/rest/AliexpressAffiliateLinkGenerateRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateLinkGenerateRequest.py similarity index 89% rename from top/api/rest/AliexpressAffiliateLinkGenerateRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateLinkGenerateRequest.py index fb44332..e98e910 100644 --- a/top/api/rest/AliexpressAffiliateLinkGenerateRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateLinkGenerateRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.03.09 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateLinkGenerateRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/top/api/rest/AliexpressAffiliateOrderGetRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateOrderGetRequest.py similarity index 88% rename from top/api/rest/AliexpressAffiliateOrderGetRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateOrderGetRequest.py index e6266da..b204db2 100644 --- a/top/api/rest/AliexpressAffiliateOrderGetRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateOrderGetRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.09.09 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateOrderGetRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/top/api/rest/AliexpressAffiliateOrderListRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateOrderListRequest.py similarity index 91% rename from top/api/rest/AliexpressAffiliateOrderListRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateOrderListRequest.py index 337976b..83413f5 100644 --- a/top/api/rest/AliexpressAffiliateOrderListRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateOrderListRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.09.08 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateOrderListRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/top/api/rest/AliexpressAffiliateProductQueryRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateProductQueryRequest.py similarity index 93% rename from top/api/rest/AliexpressAffiliateProductQueryRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateProductQueryRequest.py index 8e2a081..778f684 100644 --- a/top/api/rest/AliexpressAffiliateProductQueryRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateProductQueryRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.09.14 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateProductQueryRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/top/api/rest/AliexpressAffiliateProductdetailGetRequest.py b/aliexpress/top/api/rest/AliexpressAffiliateProductdetailGetRequest.py similarity index 90% rename from top/api/rest/AliexpressAffiliateProductdetailGetRequest.py rename to aliexpress/top/api/rest/AliexpressAffiliateProductdetailGetRequest.py index b692972..04ccc32 100644 --- a/top/api/rest/AliexpressAffiliateProductdetailGetRequest.py +++ b/aliexpress/top/api/rest/AliexpressAffiliateProductdetailGetRequest.py @@ -1,7 +1,7 @@ ''' Created by auto_sdk on 2020.05.19 ''' -from top.api.base import RestApi +from aliexpress.top.api.base import RestApi class AliexpressAffiliateProductdetailGetRequest(RestApi): def __init__(self,domain='gw.api.taobao.com',port=80): RestApi.__init__(self,domain, port) diff --git a/aliexpress/top/api/rest/__init__.py b/aliexpress/top/api/rest/__init__.py new file mode 100644 index 0000000..188028f --- /dev/null +++ b/aliexpress/top/api/rest/__init__.py @@ -0,0 +1,8 @@ +from aliexpress.top.api.rest.AliexpressAffiliateFeaturedpromoGetRequest import AliexpressAffiliateFeaturedpromoGetRequest +from aliexpress.top.api.rest.AliexpressAffiliateOrderGetRequest import AliexpressAffiliateOrderGetRequest +from aliexpress.top.api.rest.AliexpressAffiliateProductQueryRequest import AliexpressAffiliateProductQueryRequest +from aliexpress.top.api.rest.AliexpressAffiliateFeaturedpromoProductsGetRequest import AliexpressAffiliateFeaturedpromoProductsGetRequest +from aliexpress.top.api.rest.AliexpressAffiliateOrderListRequest import AliexpressAffiliateOrderListRequest +from aliexpress.top.api.rest.AliexpressAffiliateProductdetailGetRequest import AliexpressAffiliateProductdetailGetRequest +from aliexpress.top.api.rest.AliexpressAffiliateLinkGenerateRequest import AliexpressAffiliateLinkGenerateRequest +from aliexpress.top.api.rest.AliexpressAffiliateCategoryGetRequest import AliexpressAffiliateCategoryGetRequest diff --git a/setup.py b/setup.py index 62ee7a3..e0fc144 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name='python-aliexpress-api', - version='1.0.1', + version='1.0.2', author='Sergio Abad', author_email='sergio.abad@bytelix.com', description='AliExpress API wrapper for Python', diff --git a/top/api/__init__.py b/top/api/__init__.py deleted file mode 100644 index 2dfdde0..0000000 --- a/top/api/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from top.api.rest import * -from top.api.base import FileItem \ No newline at end of file diff --git a/top/api/rest/__init__.py b/top/api/rest/__init__.py deleted file mode 100644 index 4242974..0000000 --- a/top/api/rest/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from top.api.rest.AliexpressAffiliateFeaturedpromoGetRequest import AliexpressAffiliateFeaturedpromoGetRequest -from top.api.rest.AliexpressAffiliateOrderGetRequest import AliexpressAffiliateOrderGetRequest -from top.api.rest.AliexpressAffiliateProductQueryRequest import AliexpressAffiliateProductQueryRequest -from top.api.rest.AliexpressAffiliateFeaturedpromoProductsGetRequest import AliexpressAffiliateFeaturedpromoProductsGetRequest -from top.api.rest.AliexpressAffiliateOrderListRequest import AliexpressAffiliateOrderListRequest -from top.api.rest.AliexpressAffiliateProductdetailGetRequest import AliexpressAffiliateProductdetailGetRequest -from top.api.rest.AliexpressAffiliateLinkGenerateRequest import AliexpressAffiliateLinkGenerateRequest -from top.api.rest.AliexpressAffiliateCategoryGetRequest import AliexpressAffiliateCategoryGetRequest