This commit is contained in:
brent s. 2017-03-25 15:56:48 -04:00
parent e8bf36d88a
commit e6537bf98a

View File

@ -440,7 +440,8 @@ def dbEntry(conf):
print('{0}: There seems to have been some error when inserting into the DB. Check access (or it is a dupe).'.format( print('{0}: There seems to have been some error when inserting into the DB. Check access (or it is a dupe).'.format(
datetime.datetime.now())) datetime.datetime.now()))


def signEp(mediatype): def signEp(mediatype, conf):
# No reason to call this for each file. Fix.
os.makedirs('{0}/gpg'.format(conf['local']['mediadir']), exist_ok = True) os.makedirs('{0}/gpg'.format(conf['local']['mediadir']), exist_ok = True)
sigfile = '{0}/gpg/{1}.{2}.asc'.format(conf['local']['mediadir'], sigfile = '{0}/gpg/{1}.{2}.asc'.format(conf['local']['mediadir'],
conf['episode']['file_title'], conf['episode']['file_title'],
@ -486,7 +487,10 @@ def signEp(mediatype):
gpg.sign(f, s, gpgme.SIG_MODE_DETACH) gpg.sign(f, s, gpgme.SIG_MODE_DETACH)
return(sigfile) return(sigfile)


def uploadFile(): def uploadFile(conf):
# TODO: Can we do this via paramiko? That way we can check for the destination dir
# and create if it doesn't exist.
# Also, no reason to call this for each file.
print('{0}: Syncing files to server...'.format(datetime.datetime.now())) print('{0}: Syncing files to server...'.format(datetime.datetime.now()))
subprocess.call(['rsync', subprocess.call(['rsync',
'-a', '-a',
@ -607,9 +611,9 @@ def main():
conf['episode']['size']['mp3'] = getSize(mp3) conf['episode']['size']['mp3'] = getSize(mp3)
conf['episode']['size']['ogg'] = getSize(ogg) conf['episode']['size']['ogg'] = getSize(ogg)
dbEntry(conf) dbEntry(conf)
signEp('mp3') signEp('mp3', conf)
signEp('ogg') signEp('ogg', conf)
uploadFile() uploadFile(conf)
print('{0}: Finished.'.format(datetime.datetime.now())) print('{0}: Finished.'.format(datetime.datetime.now()))


if __name__ == '__main__': if __name__ == '__main__':