From 40a2350228f997c8da8d26fd54337db7e4d1427f Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Mon, 5 Dec 2016 16:58:59 +0100 Subject: [PATCH] refs #1 add ability to load kml and csv (unicsv) files, conversion with gpsbabel --- CHANGELOG.md | 3 ++ controller/pagecontroller.php | 81 +++++++++++++++++++++++++++++----- css/jQueryFileTree.min.css | 2 +- css/jqfileImages/csv.png | Bin 0 -> 382 bytes css/jqfileImages/kml.png | Bin 0 -> 440 bytes 5 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 css/jqfileImages/csv.png create mode 100644 css/jqfileImages/kml.png diff --git a/CHANGELOG.md b/CHANGELOG.md index bd335ea..1a12484 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,3 +5,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Added +- ability to load kml and csv (unicsv format) files + [#1](https://gitlab.com/eneiluj/gpxedit-oc/issues/1) @eneiluj diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index 8b693a8..c0248a0 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -181,6 +181,53 @@ class PageController extends Controller { return $response; } + + /** + * convert the given file (csv or kml) to gpx and return its content + */ + public function toGpx($file){ + $gpsbabel_path = getProgramPath('gpsbabel'); + $data_folder = $this->userAbsoluteDataPath; + $tempdir = $data_folder.'/../cache/'.rand(); + mkdir($tempdir); + + $filename = $file->getName(); + $filecontent = $file->getContent(); + $file_clear_path = $tempdir.'/'.$filename; + $gpx_target_clear_path = $tempdir.'/'.$filename.'.gpx'; + file_put_contents($file_clear_path, $filecontent); + + if (endswith($file->getName(), '.KML') or endswith($file->getName(), '.kml')){ + $fmt = 'kml'; + } + else if (endswith($file->getName(), '.csv') or endswith($file->getName(), '.CSV')){ + $fmt = 'unicsv'; + } + $args = Array('-i', $fmt, '-f', $file_clear_path, '-o', + 'gpx', '-F', $gpx_target_clear_path); + $cmdparams = ''; + foreach($args as $arg){ + $shella = escapeshellarg($arg); + $cmdparams .= " $shella"; + } + exec( + escapeshellcmd( + $gpsbabel_path.' '.$cmdparams + ), + $output, $returnvar + ); + if (file_exists($gpx_target_clear_path)){ + $gpx_clear_content = file_get_contents($gpx_target_clear_path); + } + else{ + $gpx_clear_content = ''; + } + + delTree($tempdir); + + return $gpx_clear_content; + } + /** * * @NoAdminRequired @@ -192,20 +239,22 @@ class PageController extends Controller { $gpxContent = ''; if ($userFolder->nodeExists($cleanpath)){ $file = $userFolder->get($cleanpath); - if ($file->getType() === \OCP\Files\FileInfo::TYPE_FILE and - (endswith($file->getName(), '.GPX') or endswith($file->getName(), '.gpx')) - ){ - // all ok + if ($file->getType() === \OCP\Files\FileInfo::TYPE_FILE){ + if (endswith($file->getName(), '.GPX') or endswith($file->getName(), '.gpx')){ + $gpxContent = $file->getContent(); + } + else if (getProgramPath('gpsbabel') !== null and + (endswith($file->getName(), '.KML') or endswith($file->getName(), '.kml') or + endswith($file->getName(), '.CSV') or endswith($file->getName(), '.csv')) + ){ + $gpxContent = $this->toGpx($file); + } } else{ $file = null; } } - if ($file !== null){ - $gpxContent = $file->getContent(); - } - $response = new DataResponse( [ 'gpx'=>$gpxContent @@ -285,6 +334,7 @@ class PageController extends Controller { public function getdircontent($dir) { $userFolder = \OC::$server->getUserFolder(); $userfolder_path = $userFolder->getPath(); + $gpsbabelpath = getProgramPath('gpsbabel'); $responseTxt = '