mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-20 05:13:16 -07:00
Merge branch 'hotfix/submodule' into nightly
# Conflicts: # changelog.txt
This commit is contained in:
commit
02d71c1f34
6 changed files with 20 additions and 7 deletions
|
@ -1,5 +1,5 @@
|
||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 11.8.0
|
current_version = 11.8.1
|
||||||
commit = True
|
commit = True
|
||||||
tag = False
|
tag = False
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
nzbToMedia v11.8.0
|
nzbToMedia v11.8.1
|
||||||
==================
|
==================
|
||||||
|
|
||||||
Provides an [efficient](https://github.com/clinton-hall/nzbToMedia/wiki/Efficient-on-demand-post-processing) way to handle postprocessing for [CouchPotatoServer](https://couchpota.to/ "CouchPotatoServer") and [SickBeard](http://sickbeard.com/ "SickBeard") (and its [forks](https://github.com/clinton-hall/nzbToMedia/wiki/Failed-Download-Handling-%28FDH%29#sick-beard-and-its-forks))
|
Provides an [efficient](https://github.com/clinton-hall/nzbToMedia/wiki/Efficient-on-demand-post-processing) way to handle postprocessing for [CouchPotatoServer](https://couchpota.to/ "CouchPotatoServer") and [SickBeard](http://sickbeard.com/ "SickBeard") (and its [forks](https://github.com/clinton-hall/nzbToMedia/wiki/Failed-Download-Handling-%28FDH%29#sick-beard-and-its-forks))
|
||||||
|
|
|
@ -34,6 +34,10 @@ Fix postprocessing of failed / bad downloads (#1091)
|
||||||
Fix release is None
|
Fix release is None
|
||||||
Fix UnRAR failing
|
Fix UnRAR failing
|
||||||
|
|
||||||
|
V11.8.1 12/29/2018
|
||||||
|
|
||||||
|
Fix cleanup for nzbToMedia installed as a git submodule
|
||||||
|
|
||||||
V11.8.0 12/28/2018
|
V11.8.0 12/28/2018
|
||||||
|
|
||||||
Add version information
|
Add version information
|
||||||
|
|
15
cleanup.py
15
cleanup.py
|
@ -106,9 +106,7 @@ def clean_folders(*paths):
|
||||||
|
|
||||||
def clean(*paths):
|
def clean(*paths):
|
||||||
"""Clean up bytecode and obsolete folders."""
|
"""Clean up bytecode and obsolete folders."""
|
||||||
with WorkingDirectory(module_path()) as cwd:
|
def _clean(*paths):
|
||||||
if cwd.working_directory != cwd.original_directory:
|
|
||||||
print('Changing to directory:', cwd.working_directory)
|
|
||||||
print('\n-- Cleaning bytecode --')
|
print('\n-- Cleaning bytecode --')
|
||||||
try:
|
try:
|
||||||
result = clean_bytecode()
|
result = clean_bytecode()
|
||||||
|
@ -124,8 +122,19 @@ def clean(*paths):
|
||||||
print(error)
|
print(error)
|
||||||
else:
|
else:
|
||||||
print(result or 'No folders to clean\n')
|
print(result or 'No folders to clean\n')
|
||||||
|
|
||||||
|
with WorkingDirectory(module_path()) as cwd:
|
||||||
|
if cwd.working_directory != cwd.original_directory:
|
||||||
|
print('Changing to directory:', cwd.working_directory)
|
||||||
|
|
||||||
|
if os.path.exists('.git'):
|
||||||
|
_clean(*paths)
|
||||||
|
else:
|
||||||
|
print('Directory is not a git repository')
|
||||||
|
|
||||||
if cwd.working_directory != cwd.original_directory:
|
if cwd.working_directory != cwd.original_directory:
|
||||||
print('Returning to directory: ', cwd.original_directory)
|
print('Returning to directory: ', cwd.original_directory)
|
||||||
|
|
||||||
print('\n-- Cleanup finished --\n')
|
print('\n-- Cleanup finished --\n')
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ from core.utils import (
|
||||||
resume_torrent, remove_dir, remove_read_only, sanitize_name, update_download_info_status,
|
resume_torrent, remove_dir, remove_read_only, sanitize_name, update_download_info_status,
|
||||||
)
|
)
|
||||||
|
|
||||||
__version__ = '11.8.0'
|
__version__ = '11.8.1'
|
||||||
|
|
||||||
# Client Agents
|
# Client Agents
|
||||||
NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual']
|
NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual']
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -18,7 +18,7 @@ def read(*names, **kwargs):
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='nzbToMedia',
|
name='nzbToMedia',
|
||||||
version='11.8.0',
|
version='11.8.1',
|
||||||
license='GPLv3',
|
license='GPLv3',
|
||||||
description='Efficient on demand post processing',
|
description='Efficient on demand post processing',
|
||||||
long_description="""
|
long_description="""
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue