Restructured project to better run as a package.

This should have been setup correctly, but now try to better follow
structure for python modules, which this is supposed to be.
- Renamed folder from src -> seasonedParser
- Moved test/ into seasonedParser/
- test has __init__.py script which sets location to the project folder
(seasonedParser/).
- Removed cli.py and moved contents to __main__.py
- Updated drone to run pytest without test folder parameter
This commit is contained in:
KevinMidboe
2020-02-18 23:44:16 +01:00
parent 90eff227a0
commit eb13e34e66
23 changed files with 58 additions and 23 deletions

View File

@@ -13,14 +13,14 @@ steps:
commands:
- python --version
- pip install -r requirements.txt
- py.test test
- py.test
- name: test-python3.8
image: python:3.8-alpine
commands:
- python --version
- pip install -r requirements.txt
- py.test test
- py.test
- name: codecov
image: python:3.6-alpine
@@ -29,9 +29,7 @@ steps:
from_secret: CODECOV_TOKEN
commands:
- pip install -r requirements.txt
- py.test --cov-report=xml --cov=src test
- apk add curl
- apk add bash
- py.test --cov-report=xml --cov=seasonedParserseasonedParserseasonedParserseasonedParserseasonedParserseasonedParserseasonedParserseasonedParser
- apk add git
- bash -c "$(curl -s https://codecov.io/bash)"
trigger:

View File

@@ -0,0 +1,7 @@
print('hello from init')
import sys,os
# sys.path.append(os.path.join(os.path.dirname(__file__),os.pardir))
# from
from .__version__ import __version__

22
src/cli.py → seasonedParser/__main__.py Executable file → Normal file
View File

@@ -1,4 +1,9 @@
#!usr/bin/env python3.6
#!/usr/bin/env python3.6
# -*- coding: utf-8 -*-
"""
Entry point module
"""
import click
from guessit import guessit
import logging
@@ -7,7 +12,22 @@ from core import scan_folder
from video import Video
from exceptions import InsufficientNameError
import env_variables as env
logging.basicConfig(filename=env.logfile, level=logging.INFO)
logger = logging.getLogger('seasonedParser')
fh = logging.FileHandler(env.logfile)
fh.setLevel(logging.INFO)
sh = logging.StreamHandler()
sh.setLevel(logging.WARNING)
fh_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
sh_formatter = logging.Formatter('%(levelname)s: %(message)s')
fh.setFormatter(fh_formatter)
sh.setFormatter(sh_formatter)
logger.addHandler(fh)
logger.addHandler(sh)
def tweet(video):
pass

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
Version module
"""
__version__ = '0.2.0'

View File

@@ -10,7 +10,6 @@ from babelfish import Language, LanguageReverseError
import hashlib
import os, errno
import shutil
import logging
import re
import tvdb_api
import click
@@ -20,26 +19,13 @@ import langdetect
import env_variables as env
from exceptions import InsufficientNameError
import logging
logger = logging.getLogger('seasonedParser')
from video import VIDEO_EXTENSIONS, Episode, Movie, Video
from subtitle import SUBTITLE_EXTENSIONS, Subtitle, get_subtitle_path
from utils import sanitize, refine
logging.basicConfig(filename=env.logfile, level=logging.INFO)
logger = logging.getLogger('seasonedParser')
fh = logging.FileHandler(env.logfile)
fh.setLevel(logging.INFO)
sh = logging.StreamHandler()
sh.setLevel(logging.WARNING)
fh_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
sh_formatter = logging.Formatter('%(levelname)s: %(message)s')
fh.setFormatter(fh_formatter)
sh.setFormatter(sh_formatter)
logger.addHandler(fh)
logger.addHandler(sh)
def search_external_subtitles(path, directory=None):
dirpath, filename = os.path.split(path)
dirpath = dirpath or '.'

17
seasonedParser/logger.py Normal file
View File

@@ -0,0 +1,17 @@
import logging
import env_variables as env
logging.basicConfig(filename=env.logfile, level=logging.INFO)
logger = logging.getLogger('seasonedParser')
fh = logging.FileHandler(env.logfile)
fh.setLevel(logging.INFO)
sh = logging.StreamHandler()
sh.setLevel(logging.WARNING)
fh_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
sh_formatter = logging.Formatter('%(levelname)s: %(message)s')
fh.setFormatter(fh_formatter)
sh.setFormatter(sh_formatter)
logger.addHandler(fh)
logger.addHandler(sh)

View File

@@ -0,0 +1,2 @@
import sys, os
sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/.."))

View File

@@ -1,5 +1,4 @@
import sys, os
sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/../src"))
def test_import_env_variables():
import env_variables as env

View File

View File