Changeset 119844 in spip-zone

Timestamp:

Jan 20, 2020, 4:38:49 AM (2 years ago)

Author:

Cerdic

Message:

une abstraction git et une abstraction svn pour les fonctions de bas niveau dont on a besoin pour chaque methode

Location:

_plugins_/trad-lang/trunk

Files:

• . (modified) (2 props)
• inc/salvatore_ecriveur.php (modified) (4 diffs)
• inc/salvatore_git.php (added)
• inc/salvatore_svn.php (added)

_plugins_/trad-lang/trunk/inc/salvatore_ecriveur.php

@@ -34 +34 @@
 include_spip('inc/lang_liste');
 include_spip('inc/session');
+
+include_spip('inc/salvatore_svn');
+include_spip('inc/salvatore_git');
 
 
@@ -311 +314 @@
                 $nb_to_commit = count($commit_infos);
                 if ($message_commit) {
-                        $commit_infos['message'] = $message_commit;
+                        $commit_infos['.message'] = $message_commit;
                 }
                 file_put_contents($dir_module . '/' . $module . '.commit.json', json_encode($commit_infos));
@@ -395 +398 @@
                 $file_path_relative = $source['dir'] . DIRECTORY_SEPARATOR . $file_path_relative;
         }
-        $file_path = $dir_depots . $source['dir_checkout'] . DIRECTORY_SEPARATOR . $file_path_relative;
-
-        $lastmodified = 0;
-        switch ($source['methode']) {
-                case 'git':
-                        $d = getcwd();
-                        chdir($dir_depots . $source['dir_checkout']);
-                        $lastmodified = exec("git log -1 -c --pretty=tformat:'%ct' $file_path_relative | head -1");
-                        $lastmodified = intval(trim($lastmodified));
-                        chdir($d);
-                        break;
-                case 'svn':
-                        $lastmodified = exec('env LC_MESSAGES=en_US.UTF-8 svn info ' . $file_path . "| awk '/^Last Changed Date/ { print $4 \" \" $5 }'");
-                        $lastmodified = strtotime($lastmodified);
-                        break;
-        }
-
-        return $lastmodified;
+
+        $salvatore_lastmodified_file = "salvatore_" . $source['methode'] . "_lastmodified_file";
+        return $salvatore_lastmodified_file($dir_depots . $source['dir_checkout'], $file_path_relative);
 }
 
@@ -429 +417 @@
         }
         $files_list = [$pre . $module . '_*', $pre . $module . '.xml'];
-        $files_list = implode(' ', $files_list);
-
-        $d = getcwd();
-        chdir($dir_depots . $source['dir_checkout']);
-        $output = array();
-        switch ($source['methode']) {
-                case 'git':
-                        exec("git status --short $files_list 2>&1", $output);
-                        break;
-                case 'svn':
-                        exec("svn status $files_list 2>&1", $output);
-                        break;
-        }
-        chdir($d);
-        return implode("\n", $output);
+
+        $salvatore_status_file = "salvatore_" . $source['methode'] . "_status_file";
+        return $salvatore_status_file($dir_depots . $source['dir_checkout'], $files_list);
 }