From 6d62c15251b7fe2cbbe0f80df25aa9b23cfe64d0 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 1 Nov 2013 13:29:02 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2=D1=8B?= =?UTF-8?q?=D1=87=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B0=D0=B1?= =?UTF-8?q?=D1=81=D0=BE=D0=BB=D1=8E=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF?= =?UTF-8?q?=D1=83=D1=82=D0=B8,=20=D0=BF=D0=BE=D1=81=D0=BA=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D1=83=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D0=B9=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82?= =?UTF-8?q?=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=20=D1=83=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=B8=D1=82=D1=8C=20=D1=82=D0=B5=D0=BA?= =?UTF-8?q?=D1=83=D1=8E=D1=89=D1=83=D1=8E=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommandBuilders/CreateBackupCommandBuilder.py | 7 +------ scripts/commands/CreateBackupCommand.py | 12 +++++------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/scripts/CommandBuilders/CreateBackupCommandBuilder.py b/scripts/CommandBuilders/CreateBackupCommandBuilder.py index f1f7f17..79b7cbb 100644 --- a/scripts/CommandBuilders/CreateBackupCommandBuilder.py +++ b/scripts/CommandBuilders/CreateBackupCommandBuilder.py @@ -3,11 +3,6 @@ from parser.BackupParser.CreateBackupParser import CreateBackupParser class CreateBackupCommandBuilder: - def __init__(self, pathProvider): - assert pathProvider is not None - - self.__pathProvider = pathProvider - def isCreateBackup(self, line): assert line is not None @@ -20,5 +15,5 @@ class CreateBackupCommandBuilder: parser = CreateBackupParser() backupArguments = parser.parseLine(line) - command = CreateBackupCommand(self.__pathProvider, backupArguments) + command = CreateBackupCommand(backupArguments) return command diff --git a/scripts/commands/CreateBackupCommand.py b/scripts/commands/CreateBackupCommand.py index 59d5ab9..fde6715 100644 --- a/scripts/commands/CreateBackupCommand.py +++ b/scripts/commands/CreateBackupCommand.py @@ -1,16 +1,14 @@ import shutil class CreateBackupCommand: - def __init__(self, pathProvider, createBackupArguments): - assert pathProvider is not None - assert createBackupArguments is not None + def __init__(self, backupArguments): + assert backupArguments is not None - self.__pathProvider = pathProvider - self.__createBackupArguments = createBackupArguments + self.__backupArguments = backupArguments def execute(self): - src = self.__pathProvider.resolveAbsPath(self.__createBackupArguments.getSourceFolderName()) - dst = self.__pathProvider.resolveAbsPath(self.__createBackupArguments.getBackupFolderName()) + src = self.__backupArguments.getSourceFolderName() + dst = self.__backupArguments.getBackupFolderName() shutil.rmtree(dst, ignore_errors=True) shutil.copytree(src, dst, symlinks=False)