Defined clearer steps in drone build

* Trying explicitly defining colored package version.

* Try first installing from requirements.

* Tried defining pyproject file.

* Requirements references setup packages.

* Import __version__ from import statement directly.

* Removed unused packages and restored requirements file.

* Install dependencies before running setup.

.drone.yml

@@ -8,18 +8,23 @@ platform:
   arch: amd64
 
 steps:
-  - name: Install python
+  - name: Build package
     image: python:3.8
     commands:
-      - python setup.py install
+      - make build
+
+  - name: Run tests
+    image: python:3.8
+    commands:
+      - make install
       - pip install pytest
       - pytest
 
   - name: Upload coverage report
     image: python:3.8
     commands:
-      - python setup.py install
       - pip install -r requirements-dev.txt
+      - make install
       - coverage run -m pytest
       - codecov -t $CODECOV_TOKEN
     environment:

Makefile

@@ -0,0 +1,18 @@
+.PHONY: clean
+binaries=dist build
+
+install:
+	python3 setup.py install
+
+dist:
+	python3 setup.py sdist
+
+build:
+	python3 setup.py build
+
+upload: clean dist
+	twine upload dist/*
+
+clean:
+	rm -rf $(binaries)
+

README.md

@@ -1,8 +1,12 @@
 # Torrent Search
 
-| Tested version | PyPi package | Drone CI | Travis CI | Code coverage | Known vulnerabilities | License |
+| Tested version | PyPi package | Drone CI | Travis CI |
-|:--------|:------|:------|:------|:------|:------|:------------|
+|:--------|:------|:------|:------------|
-| [![PyVersion](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/) | ![PyPI](https://img.shields.io/pypi/v/torrentSearch) | [![Build Status](https://drone.schleppe.cloud/api/badges/KevinMidboe/torrent_search/status.svg)](https://drone.schleppe.cloud/KevinMidboe/torrent_search) | [![Build Status](https://travis-ci.org/KevinMidboe/torrent_search.svg?branch=master)](https://travis-ci.org/KevinMidboe/torrent_search) | [![codecov](https://codecov.io/gh/KevinMidboe/torrent_search/branch/master/graph/badge.svg)](https://codecov.io/gh/KevinMidboe/torrent_search) | [![Known Vulnerabilities](https://snyk.io/test/github/kevinmidboe/torrent_search/badge.svg?targetFile=requirements.txt)](https://snyk.io/test/github/kevinmidboe/torrent_search?targetFile=requirements.txt) | [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
+| [![PyVersion](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/) | [![PyPI](https://img.shields.io/pypi/v/torrentSearch)](https://pypi.org/project/torrentSearch/) | [![Build Status](https://drone.schleppe.cloud/api/badges/KevinMidboe/torrent_search/status.svg)](https://drone.schleppe.cloud/KevinMidboe/torrent_search) | [![Build Status](https://travis-ci.org/KevinMidboe/torrent_search.svg?branch=master)](https://travis-ci.org/KevinMidboe/torrent_search)
+
+| Code coverage | Known vulnerabilities | License |
+|:--------|:------|:------------|
+| [![codecov](https://codecov.io/gh/KevinMidboe/torrent_search/branch/master/graph/badge.svg)](https://codecov.io/gh/KevinMidboe/torrent_search) | [![Known Vulnerabilities](https://snyk.io/test/github/kevinmidboe/torrent_search/badge.svg?targetFile=requirements.txt)](https://snyk.io/test/github/kevinmidboe/torrent_search?targetFile=requirements.txt) | [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
 ## Idea
 The idea behind this project is to create a modular torrent searcher/indexer in python. Currently we have the option to search for two sites, thepiratebay and with jackett. To add more sites one only needs to create a scraper script for a specific service, and from there create torrent class objects that are returned back to the search script. If the new site needs specific configuration values this can be set in the config.ini file and needs to be imported in the site selector in search.py. 

pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+
+build-backend = "setuptools.build_meta"

requirements.txt

@@ -1,4 +1,2 @@
-beautifulsoup4>=4.6.0
-termcolor>=1.1.0
 docopt==0.6.2
 colored==1.3.5

setup.py

@@ -2,21 +2,29 @@
 # -*- encoding: utf-8 -*-
 
 from setuptools import setup, find_packages
+from sys import path
+from os.path import dirname
 
-import torrentSearch
+with open("README.md", "r", encoding="utf-8") as fh:
+  long_description = fh.read()
+
+exec(open('torrentSearch/__version__.py').read())
 
 setup(
     name='torrentSearch',
-    version=torrentSearch.__version__,
+    version=__version__,
     packages=find_packages(),
+    package_data={
+        'torrentSearch': ['default_config.ini'],
+    },
     author='KevinMidboe',
     description='Search For Torrents',
-    long_description="README on github : https://github.com/KevinMidboe/torrent_search",
+    long_description=long_description,
+    long_description_content_type='text/markdown',
     install_requires=[
+        'bs4',
         'docopt',
-        'beautifulsoup4',
+	    'colored'
-        'termcolor',
-	    'colored',
     ],
     url='https://github.com/KevinMidboe/torrent_search',
     classifiers=[

torrentSearch/__init__.py

@@ -7,4 +7,13 @@ from sys import path
 from os.path import dirname
 path.append(dirname(__file__))
 
-__version__ = '0.1'
+import logging
+from utils import ColorizeFilter
+ch = logging.StreamHandler()
+formatter = logging.Formatter('%(asctime)s %(levelname)8s %(name)s | %(message)s')
+ch.setFormatter(formatter)
+
+logger = logging.getLogger('torrentSearch')
+logger.addHandler(ch)
+logger.setLevel(logging.ERROR)  # This toggles all the logging in your app
+logger.addFilter(ColorizeFilter())

torrentSearch/__main__.py

@@ -25,19 +25,12 @@ import logging.config
 import signal
 
 from docopt import docopt
-from __init__ import __version__
+from __version__ import __version__
 
 from search import searchTorrentSite
-from utils import ColorizeFilter, getConfig
+from utils import getConfig
-
-ch = logging.StreamHandler()
-formatter = logging.Formatter('%(asctime)s %(levelname)8s %(name)s | %(message)s')
-ch.setFormatter(formatter)
 
 logger = logging.getLogger('torrentSearch')
-logger.addHandler(ch)
-logger.setLevel(logging.ERROR)  # This toggles all the logging in your app
-logger.addFilter(ColorizeFilter())
 
 def main():
    """

torrentSearch/__version__.py

@@ -0,0 +1,2 @@
+__version__ = '0.3.2-5'
+

torrentSearch/config.ini

@@ -1,18 +0,0 @@
-[DEFAULT]
-SITE_OPTIONS = piratebay,jackett
-
-[JACKETT]
-HOST = CHANGE_THIS_TO_THE_IP_AND_PORT_OF_JACKETT
-PATH = torznab/all
-LIMIT = 150
-JACKETT_MAX_SEARCH_RESULT = 1000
-SSL = false
-RESULTS_PER_PAGE = 75
-APIKEY = CHANGE_THIS_TO_YOUR_JACKETT_API_KEY
-
-
-[PIRATEBAY]
-HOST = thepiratebay.org
-PATH = search
-LIMIT = 150
-SSL = true

torrentSearch/default_config.ini

@@ -0,0 +1,18 @@
+[DEFAULT]
+SITE_OPTIONS = piratebay,jackett
+
+[JACKETT]
+HOST=
+PATH=torznab/all
+LIMIT=150
+JACKETT_MAX_SEARCH_RESULT=1000
+SSL=false
+RESULTS_PER_PAGE=75
+APIKEY=
+
+
+[PIRATEBAY]
+HOST=thepiratebay.org
+PATH=search
+LIMIT=150
+SSL=true

torrentSearch/jackett.py

@@ -8,6 +8,7 @@ from xml.etree.ElementTree import fromstring
 
 from http_utils import build_url, fetch_url
 from torrent import Torrent
+from utils import humansize, representsInteger
 
 logger = logging.getLogger('torrentSearch')
 
@@ -103,6 +104,8 @@ class Jackett(object):
                seeders = elm.get('value')
             if elm.get('name') == 'peers':
                peers = elm.get('value')
+            if size != '' and representsInteger(size):
+               size = humansize(int(size))
 
          logger.debug('Found torrent with info: \n\ttitle: {}\n\tmagnet: {}\n\tsize: {}\n\tdate: {}\
             \n\tseeders: {}\n\tpeers: {}'.format(title, magnet, size, date, seeders, peers))

torrentSearch/utils.py

@@ -7,6 +7,7 @@
 
 import re
 import os
+import shutil
 import logging
 import colored
 import configparser
@@ -25,19 +26,26 @@ SYMBOLS = {
 }
 
 __all__ = ('ColorizeFilter', )
+logger = logging.getLogger('torrentSearch')
 
 def getConfig():
-   """
+  """
-   Read path and get configuartion file with site settings
+  Read path and get configuartion file with site settings
+  :return: config settings read from 'config.ini'
+  :rtype: configparser.ConfigParser
+  """
+  config = configparser.ConfigParser()
+  user_config_dir = os.path.expanduser("~") + "/.config/torrentSearch"
 
-   :return: config settings read from 'config.ini'
+  config_dir = os.path.join(user_config_dir, 'config.ini')
-   :rtype: configparser.ConfigParser
+  if not os.path.isfile(config_dir):
-   """
+    defaultConfig = os.path.join(BASE_DIR, 'default_config.ini')
-   config = configparser.ConfigParser()
+    logger.error('Missing config! Moved default_config.ini to {}.\nOpen this file and set all varaibles!'.format(config_dir))
-   config_dir = os.path.join(BASE_DIR, 'config.ini')
+    os.makedirs(user_config_dir, exist_ok=True)
-   config.read(config_dir)
+    shutil.copyfile(defaultConfig, config_dir)
 
-   return config
+  config.read(config_dir)
+  return config
 
 class ColorizeFilter(logging.Filter):
    """