Fixed bugs with crypto.py, need to work on cleanup

Project is now properly encrypting the archive,
and now I just need to ensure proper decryption
is happening. Also need to work on cleaning up
clear text versions of the crypt project files.
Need to write tests for flushing out edge cases.
This commit is contained in:
Nich 2016-03-28 06:04:27 +00:00
parent c32201fd05
commit a3cb5f13ed
3 changed files with 27 additions and 26 deletions

View file

@ -145,11 +145,11 @@ class PappySession(object):
@defer.inlineCallbacks
def encrypt(self):
self.crypto.encrypt_project(self.password)
yield self.crypto.encrypt_project()
@defer.inlineCallbacks
def decrypt(self):
self.crypto.decrypt_project()
yield self.crypto.decrypt_project()
@defer.inlineCallbacks
def cleanup(self, ignored=None):
@ -159,6 +159,11 @@ class PappySession(object):
if self.delete_data_on_quit:
print 'Deleting temporary datafile'
os.remove(self.config.datafile)
# If currently in the crypt directory,
# encrypt the project, delete clear files
if os.getcwd() == self.config.crypt_dir:
self.encrypt()
def parse_args():
# parses sys.argv and returns a settings dictionary