Merge pull request #37 from mmarquezs/master

Make develop branch == master.

Author: mmarquezs

.github/workflows/pythonpublish.yml

@@ -0,0 +1,26 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        python setup.py sdist bdist_wheel
+        twine upload dist/*

README.md

@@ -58,8 +58,20 @@ device.downloads.query_packages([{
 ```
 # DOCUMENTATION
 
+Sadly currently broken. In any case the documentation was generated with the pydoc comments inside the code itself so checking the code should be enough for now.
+
 http://myjdownloader-api-python-library.readthedocs.org/en/latest/myjdapi.html#module-myjdapi
 
+
+# PROJECTS USING THE LIBRARY
+Here are example of projects currently using the library. If you want to add your project feel free to open a PR so it gets added.
+
+:warning: **WARNING**: I am not endorsing or curating these projects and neither I am responsible nor liable for any problems, losses or damages caused by any of those libraries. Take your own precautions.
+
+* **PyYoutube2JD** - Allows JDownloader users to get all video links from a Youtube account (or playlist). - https://github.com/MarianoDesivo/PyYoutube2JD
+
+
+
 # LICENSE
 The MIT License (MIT)
 

myjdapi/__init__.py

@@ -1,2 +1,2 @@
-from .myjdapi import Myjdapi
-__version__ = '1.0.3.dev1'
+from .myjdapi import Myjdapi
+__version__ = '1.0.6'

myjdapi/myjdapi.py

@@ -394,6 +394,13 @@ def add_links(self,
         """
         resp = self.device.action("/linkgrabberv2/addLinks", params)
         return resp
+    
+    def is_collecting(self):
+        """
+        Boolean status query about the collecting process
+        """
+        resp = self.device.action(self.url+"/isCollecting")
+        return resp
 
     def get_childrenchanged(self):
         """
@@ -458,12 +465,26 @@ def rename_package(self):
         """
         pass
 
-    def query_packages(self):
-        """
-        No idea what parameters i have to pass and/or i don't know what it does.
-        If i find out i will implement it :P
-        """
-        pass
+    def query_packages(self,
+                       params=[{
+                           "availableOfflineCount":True,
+                           "availableOnlineCount":True,
+                           "availableTempUnknownCount":True,
+                           "availableUnknownCount":True,
+                           "bytesTotal":True,
+                           "childCount":True,
+                           "comment":True,
+                           "enabled":True,
+                           "hosts":True,
+                           "maxResults":-1,
+                           "packageUUIDs":[],
+                           "priority":True,
+                           "saveTo":True,
+                           "startAt":0,
+                           "status":True
+                       }]):
+        resp = self.device.action(self.url + "/queryPackages", params)
+        return resp
 
     def move_packages(self):
         """
@@ -606,6 +627,36 @@ def force_download(self, link_ids=[], package_ids=[]):
         resp = self.device.action(self.url + "/forceDownload", params)
         return resp
 
+class Captcha:
+    """
+    Class that represents the captcha interface of a Device
+    """
+
+    def __init__(self, device):
+        self.device = device
+        self.url = "/captcha"
+
+    """
+    Get the waiting captchas
+    """
+    def list(self):
+        resp = self.device.action(self.url + "/list", [])
+        return resp
+
+    """
+    Get the base64 captcha image
+    """
+    def get(self, captcha_id):
+        resp = self.device.action(self.url + "/get", (captcha_id,))
+        return resp
+
+    """
+    Solve a captcha
+    """
+    def solve(self, captcha_id, solution):
+        resp = self.device.action(self.url + "/solve", (captcha_id, solution))
+        return resp
+
 
 class Jddevice:
     """
@@ -623,6 +674,7 @@ def __init__(self, jd, device_dict):
         self.device_type = device_dict["type"]
         self.myjd = jd
         self.linkgrabber = Linkgrabber(self)
+        self.captcha = Captcha(self)
         self.downloads = Downloads(self)
         self.toolbar = Toolbar(self)
         self.downloadcontroller = DownloadController(self)

setup.py

@@ -1,36 +1,36 @@
-"""A setuptools based setup module.
-See:
-https://packaging.python.org/en/latest/distributing.html
-https://github.com/pypa/sampleproject
-"""
-from setuptools import setup, find_packages
-from codecs import open
-from os import path
-here = path.abspath(path.dirname(__file__))
-with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
-    long_description = f.read()
-setup(
-    name='myjdapi',
-    version='1.0.3.dev1',
-    description='Library to use My.Jdownloader API in an easy way.',
-    long_description=long_description,
-    url='https://github.com/mmarquezs/My.Jdownloader-API-Python-Library/',
-    author='Marc Marquez Santamaria',
-    author_email='[email protected]',
-    license='MIT',
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Libraries',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-    ],
-    keywords='myjdapi jdownloader my.jdownloader api development',
-    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
-    # py_modules=["libgenapi"],
-    install_requires=['requests','pycryptodome'],
-)
+"""A setuptools based setup module.
+See:
+https://packaging.python.org/en/latest/distributing.html
+https://github.com/pypa/sampleproject
+"""
+from setuptools import setup, find_packages
+from codecs import open
+from os import path
+here = path.abspath(path.dirname(__file__))
+with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = f.read()
+setup(
+    name='myjdapi',
+    version='1.0.6',
+    description='Library to use My.Jdownloader API in an easy way.',
+    long_description=long_description,
+    url='https://github.com/mmarquezs/My.Jdownloader-API-Python-Library/',
+    author='Marc Marquez Santamaria',
+    author_email='[email protected]',
+    license='MIT',
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Libraries',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+    ],
+    keywords='myjdapi jdownloader my.jdownloader api development',
+    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
+    # py_modules=["libgenapi"],
+    install_requires=['requests','pycryptodome'],
+)