Fixes to make the lib work

Author: benmod

.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+dist
+openpaygo.egg-info

README.md

@@ -22,14 +22,15 @@ This open-source project was sponsored by:
 ## Table of Contents
 
   - [Installing the library](#installing-the-library)
-  - [Getting Started - Generating Token](#getting-started---generating-token)
+  - [Getting Started - Generating Tokens](#getting-started---generating-tokens)
+  - [Getting Started - Decoding a Token](#getting-started---decoding-a-token)
 
 
 ## Installing the library
 
 You can install the library by running `pip install openpaygo` or adding `openpaygo` in your requirements.txt file and running `pip install -r requirements.txt`. 
 
-## Getting Started - Generating Token
+## Getting Started - Generating Tokens
 
 You can use the `generate_token()` function to generate an OpenPAYGOToken Token. The function takes the following parameters, and they should match the configuration in the hardware of the device: 
 
@@ -48,7 +49,7 @@ The function returns the `updated_count` as a number as well as the `token` as a
 **Example 1 - Add 7 days:**
 
 ```
-from openpaygo.optoken import generate_token
+from openpaygo import generate_token
 from myexampleproject import device_getter
 
 # We get a device with the parameters we need from our database, this will be specific to your project
@@ -68,7 +69,7 @@ device.save() # We save the new count that we set for the device
 **Example 2 - Disable PAYG (unlock forever):**
 
 ```
-from openpaygo.optoken import generate_token, TokenType
+from openpaygo import generate_token, TokenType
 
 ...
 
@@ -109,7 +110,7 @@ The function will raise a `ValueError` if the key is in the wrong format, but wi
 **Example:**
 
 ```
-from openpaygo.optoken import decode_token
+from openpaygo import decode_token
 
 # We assume the users enters a token and that the device state is saved in my_device_state
 ...
@@ -138,8 +139,14 @@ elif token_type == TokenType.DISABLE_PAYG:
   my_device_state.unlocked_forever = True
 elif token_type == TokenType.COUNTER_SYNC:
   print('Counter Synced')
-if token_type == TokenType.ALREADY_USED:
+elif token_type == TokenType.ALREADY_USED:
   print('Token was already used')
 elif token_type == TokenType.INVALID:
   print('Token is invalid')
-```
+```
+
+
+## Changelog
+
+### 2023-10-03 - v0.1.2
+- First working version published on PyPi

openpaygo/__init__.py

@@ -0,0 +1,11 @@
+from .encode_token import OpenPAYGOTokenEncoder
+from .decode_token import OpenPAYGOTokenDecoder
+from .shared import TokenType
+
+
+def generate_token(**kwargs):
+    return OpenPAYGOTokenEncoder.generate_token(**kwargs)
+
+
+def decode_token(**kwargs):
+    return OpenPAYGOTokenDecoder.decode_token(**kwargs)

optoken/decode_token.py openpaygo/decode_token.pyoptoken/decode_token.py renamed to openpaygo/decode_token.py

@@ -1,5 +1,5 @@
-from shared import OpenPAYGOTokenShared, TokenType
-from shared_extended import OpenPAYGOTokenSharedExtended
+from .shared import OpenPAYGOTokenShared, TokenType
+from .shared_extended import OpenPAYGOTokenSharedExtended
 
 
 class OpenPAYGOTokenDecoder(object):

optoken/encode_token.py openpaygo/encode_token.pyoptoken/encode_token.py renamed to openpaygo/encode_token.py

@@ -1,5 +1,5 @@
-from shared import OpenPAYGOTokenShared, TokenType
-from shared_extended import OpenPAYGOTokenSharedExtended
+from .shared import OpenPAYGOTokenShared, TokenType
+from .shared_extended import OpenPAYGOTokenSharedExtended
 
 
 class OpenPAYGOTokenEncoder(object):

optoken/shared.py openpaygo/shared.pyoptoken/shared.py renamed to openpaygo/shared.py

@@ -1,6 +1,6 @@
 [metadata]
 name = openpaygo
-version = 0.1.0
+version = 0.1.2
 url = https://github.com/openpaygo/openpaygo-python
 description-file=README.md
 license_files=LICENSE

optoken/shared_extended.py openpaygo/shared_extended.pyoptoken/shared_extended.py renamed to openpaygo/shared_extended.py

@@ -4,7 +4,7 @@
 setup(
     name="openpaygo", 
     packages=find_packages(),
-    version='0.1.0',
+    version='0.1.2',
     license='MIT',
     author="Solaris Offgrid",
     url='https://github.com/openpaygo/openpaygo-python',