KevinMidboe/transatlanticTorrentExpress
1
0
Fork 0
mirror of https://github.com/KevinMidboe/transatlanticTorrentExpress.git synced 2025-10-29 18:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced all prints with logger messages. Also added more info logging of what files are found

Browse Source
This commit is contained in:
Kevin
2019-04-29 22:26:23 +02:00
parent 9c95395827
commit 524cc82020
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
transatlanticTorrentExpress.py
View File

@@ -7,7 +7,7 @@ from configparser import ConfigParser
from logger import logger from logger import logger
def getConfig(): def getConfig():
print('Reading config') logger.info('Reading config')
pwd = os.path.dirname(os.path.abspath(__file__)) pwd = os.path.dirname(os.path.abspath(__file__))
path = os.path.join(pwd, 'config.ini') path = os.path.join(pwd, 'config.ini')
@@ -18,13 +18,11 @@ def getConfig():
config = ConfigParser() config = ConfigParser()
config.read(path) config.read(path)
print('Sections parsed: {}'.format(config.sections())) logger.info('Sections parsed: {}'.format(config.sections()))
return config return config
def getFiles(path, host=None, user=None): def getFiles(path, host=None, user=None):
print('Checking path: {}'.format(path))
if (host and user): if (host and user):
cmd = 'ssh {}@{} ls {}'.format(user, host, path) cmd = 'ssh {}@{} ls {}'.format(user, host, path)
else: else:
@@ -49,7 +47,7 @@ def transferFiles(files, localPath, remotePath, host=None, user=None):
transferedFiles = [] transferedFiles = []
for file in files: for file in files:
logger.info('Moving file: ', file) logger.info('Moving file: {}'.format(file))
file = os.path.join(localPath, file) file = os.path.join(localPath, file)
if (host and user): if (host and user):
@@ -61,9 +59,9 @@ def transferFiles(files, localPath, remotePath, host=None, user=None):
stdout, stderr = rsyncProcess.communicate() stdout, stderr = rsyncProcess.communicate()
if stderr: if stderr:
logger.error('Rsync error:', stderr) logger.error('Rsync error: {}'.format(stderr))
print(stdout) logger.info('Rsync output: {}'.format(stdout))
transferedFiles.append(file) transferedFiles.append(file)
return transferedFiles return transferedFiles
@@ -73,8 +71,7 @@ def removeFromDeluge(execScript, files):
for file in files: for file in files:
file = file.split('/')[-1] file = file.split('/')[-1]
print('Removing {} from deluge'.format(file))
logger.info('Removing {} from deluge'.format(file)) logger.info('Removing {} from deluge'.format(file))
cmd = "{} {} rm '{}'".format(execPython, execScript, file) cmd = "{} {} rm '{}'".format(execPython, execScript, file)
@@ -82,10 +79,10 @@ def removeFromDeluge(execScript, files):
stdout, stderr = delugeProcess.communicate() stdout, stderr = delugeProcess.communicate()
if stderr: if stderr:
logger.error('Deluge error:', stderr) logger.error('Deluge error: {}'.format(stderr))
logger.info('Deluge response:', stdout) logger.info('Deluge output: {}'.format(stdout))
logger.info('Successfully removed: ', file) logger.info('Successfully removed: {}'.format(file))
def main(): def main():
config = getConfig() config = getConfig()
@@ -96,10 +93,12 @@ def main():
delugeScript = config['DELUGE']['script'] delugeScript = config['DELUGE']['script']
remoteFiles = getFiles(remotePath, host, user) remoteFiles = getFiles(remotePath, host, user)
logger.info('Remote files found: {}'.format(remoteFiles))
# print('Remote found: {}'.format(remoteFiles)) # print('Remote found: {}'.format(remoteFiles))
localFiles = getFiles(localPath) localFiles = getFiles(localPath)
# print('Local files: {}'.format(localFiles)) # print('Local files: {}'.format(localFiles))
logger.info('Local files found: {}'.format(localFiles))
newFiles = filesNotShared(localFiles, remoteFiles) newFiles = filesNotShared(localFiles, remoteFiles)
if (newFiles): if (newFiles):