From 0db2d2145810e93801dd77f5f016647a606e1f73 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Wed, 22 Nov 2017 11:17:43 +0100
Subject: Create cache directory in DB instead of Settings

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 META.json                       | 2 +-
 cpanfile                        | 2 +-
 lib/App/BorgRestore/DB.pm       | 4 ++++
 lib/App/BorgRestore/Settings.pm | 4 ----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/META.json b/META.json
index cba2f5d..8a17947 100644
--- a/META.json
+++ b/META.json
@@ -46,7 +46,6 @@
             "DBD::SQLite" : "0",
             "DBI" : "0",
             "Date::Parse" : "0",
-            "File::Path" : "0",
             "File::Temp" : "0",
             "File::pushd" : "0",
             "Function::Parameters" : "0",
@@ -61,6 +60,7 @@
             "Log::Log4perl::Appender::ScreenColoredLevels" : "0",
             "Log::Log4perl::Layout::PatternLayout" : "0",
             "Log::Log4perl::Level" : "0",
+            "Path::Tiny" : "0",
             "Pod::Usage" : "0",
             "Version::Compare" : "0",
             "autodie" : "0",
diff --git a/cpanfile b/cpanfile
index 548434a..82a5c73 100644
--- a/cpanfile
+++ b/cpanfile
@@ -1,6 +1,6 @@
 requires 'DBD::SQLite';
 requires 'DBI';
-requires 'File::Path';
+requires 'Path::Tiny';
 requires 'File::Temp';
 requires 'File::pushd';
 requires 'Function::Parameters';
diff --git a/lib/App/BorgRestore/DB.pm b/lib/App/BorgRestore/DB.pm
index 35975d6..0bc5214 100644
--- a/lib/App/BorgRestore/DB.pm
+++ b/lib/App/BorgRestore/DB.pm
@@ -9,6 +9,7 @@ use autodie;
 use DBI;
 use Function::Parameters;
 use Log::Any qw($log);
+use Path::Tiny;
 
 =encoding utf-8
 
@@ -27,6 +28,9 @@ method new($class: $db_path, $cache_size) {
 	bless $self, $class;
 
 	if (! -f $db_path) {
+		# ensure the cache directory exists
+		path($db_path)->parent->mkpath({mode => oct(700)});
+
 		my $db = $self->_open_db($db_path, $cache_size);
 		$self->initialize_db();
 	} else {
diff --git a/lib/App/BorgRestore/Settings.pm b/lib/App/BorgRestore/Settings.pm
index 26a175e..557a097 100644
--- a/lib/App/BorgRestore/Settings.pm
+++ b/lib/App/BorgRestore/Settings.pm
@@ -6,7 +6,6 @@ use warnings;
 use App::BorgRestore::Helper;
 
 use autodie;
-use File::Path qw(mkpath);
 use Sys::Hostname;
 
 =encoding utf-8
@@ -124,9 +123,6 @@ for my $configfile (@configfiles) {
 }
 $cache_path_base = App::BorgRestore::Helper::untaint($cache_path_base, qr/.*/);
 
-# ensure the cache directory exists
-mkpath(get_cache_dir(), {mode => oct(700)});
-
 sub get_cache_dir {
 	return "$cache_path_base/v2";
 }
-- 
cgit v1.2.3-24-g4f1b