Changeset 1423

Timestamp:

Dec 16, 2011, 4:19:31 AM (11 years ago)

Author:

Peter Johansson

Message:

new classes DirectoryUtil? and CacheRemover?. remove obsoleted cache files. closes #510

Location:

trunk

Files:

• bin/svncopyright.cc (modified) (3 diffs)
• bin/svndigest.cc (modified) (2 diffs)
• lib/CacheRemover.cc (added)
• lib/CacheRemover.h (added)
• lib/Directory.cc (modified) (5 diffs)
• lib/DirectoryUtil.cc (added)
• lib/DirectoryUtil.h (added)
• lib/Makefile.am (modified) (4 diffs)
• lib/SvndigestVisitor.cc (modified) (4 diffs)
• lib/rmdirhier.cc (modified) (2 diffs)
• lib/utility.cc (modified) (2 diffs)
• lib/utility.h (modified) (2 diffs)
• test/Makefile.am (modified) (1 diff)
• test/remove_cache_test.sh (modified) (3 diffs)
• yat/Makefile.am (modified) (2 diffs)

trunk/bin/svncopyright.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2010 Peter Johansson
+  Copyright (C) 2010, 2011 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -22 +22 @@
 #include "svncopyrightParameter.h"
 
+#include "lib/CacheRemover.h"
 #include "lib/Configuration.h"
 #include "lib/Directory.h"
@@ -68 +69 @@
 
     update_copyright(tree, option.verbose(), option.ignore_cache());
+    CacheRemover cache_remover(option.verbose(), ".svncopyright-cache");
+    tree.traverse(cache_remover);
   }
   catch (std::runtime_error& e) {

trunk/bin/svndigest.cc

@@ -23 +23 @@
 #include "svndigestParameter.h"
 
+#include "lib/CacheRemover.h"
 #include "lib/Configuration.h"
 #include "lib/css.h"
@@ -133 +134 @@
                       tree.svn_info().url(), file_count);
 
+    CacheRemover cache_remover(option.verbose(), ".svndigest-cache");
+    tree.traverse(cache_remover);
   }
   catch (std::runtime_error& e) {

trunk/lib/Directory.cc

@@ -24 +24 @@
 #include "Alias.h"
 #include "Configuration.h"
+#include "DirectoryUtil.h"
 #include "File.h"
 #include "html_utility.h"
@@ -39 +40 @@
 #include <iostream>
 #include <iterator>
-#include <list>
 #include <map>
 #include <sstream>
+#include <vector>
 
-#include <cerrno> // Needed to check error state below.
-#include <dirent.h>
 #include <sys/stat.h>
 
@@ -51 +50 @@
 
 
-  Directory::Directory(const unsigned int level, const std::string& path, 
+  Directory::Directory(const unsigned int level, const std::string& path,
                        const std::string& output, const std::string& project)
     : Node(level,path,output,project)
@@ -59 +58 @@
       output_dir_+='/';
 
-    using namespace std;
-    DIR* directory=opendir(path.c_str());    // C API from dirent.h
-    if (!directory)
-      throw NodeException("ERROR: opendir() failed; " + path +
-                          " is not a directory");
-    list<string> entries;
-    struct dirent* entry;
-    errno=0;  // Global variable used by C to track errors, from errno.h
-    while ((entry=readdir(directory)))       // C API from dirent.h
-      entries.push_back(string(entry->d_name));
-    if (errno)
-      throw NodeException("ERROR: readdir() failed on " + path);
-    closedir(directory);
+    DirectoryUtil dir(path);
 
     SVN* svn=SVN::instance();
-    for (list<string>::iterator i=entries.begin(); i!=entries.end(); ++i)
-      if ((*i)!=string(".") && (*i)!=string("..") && (*i)!=string(".svn")) {
-        string fullpath(path_+'/'+(*i));
-        switch (svn->version_controlled(fullpath)) {
+    for (DirectoryUtil::const_iterator i=dir.begin(); i!=dir.end(); ++i) {
+      std::string fn = file_name(i->path());
+      if (fn!="." && fn!=".." && fn!=".svn") {
+        const std::string& fullpath = i->path();
+        switch(svn->version_controlled(fullpath)) {
         case SVN::uptodate:
           struct stat nodestat;                // C api from sys/stat.h
@@ -91 +79 @@
         }
       }
+    }
     std::sort(daughters_.begin(), daughters_.end(), NodePtrLess());
   }

trunk/lib/Makefile.am

@@ -5 +5 @@
 # Copyright (C) 2005 Jari Häkkinen
 # Copyright (C) 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2010 Peter Johansson
+# Copyright (C) 2010, 2011 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -27 +27 @@
 noinst_LIBRARIES = libsvndigest.a libsvndigest_core.a
 
-noinst_HEADERS = AddStats.h Alias.h BlameStats.h CacheCopyer.h ClassicStats.h \
+noinst_HEADERS = AddStats.h Alias.h BlameStats.h CacheCopyer.h \
+  CacheRemover.h ClassicStats.h \
   Colors.h Commitment.h Configuration.h \
   CopyrightStats.h CopyrightVisitor.h css.h \
-  Date.h Directory.h DirectoryPrinter.h File.h FilePrinter.h \
+  Date.h Directory.h DirectoryPrinter.h DirectoryUtil.h File.h FilePrinter.h \
   first_page.h Functor.h \
   Graph.h \
@@ -44 +45 @@
 libsvndigest_a_SOURCES += DirectoryPrinter.cc
 libsvndigest_a_SOURCES += FilePrinter.cc
-libsvndigest_a_SOURCES += first_page.cc 
-libsvndigest_a_SOURCES += Graph.cc 
+libsvndigest_a_SOURCES += first_page.cc
+libsvndigest_a_SOURCES += Graph.cc
 libsvndigest_a_SOURCES += NodePrinter.cc
-libsvndigest_a_SOURCES += StatsPlotter.cc 
-libsvndigest_a_SOURCES += SvndigestVisitor.cc 
+libsvndigest_a_SOURCES += StatsPlotter.cc
+libsvndigest_a_SOURCES += SvndigestVisitor.cc
 
 libsvndigest_core_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
-  CacheCopyer.cc ClassicStats.cc Colors.cc \
+  CacheCopyer.cc CacheRemover.cc ClassicStats.cc Colors.cc \
   Commitment.cc Configuration.cc CopyrightStats.cc CopyrightVisitor.cc \
-  css.cc Date.cc Directory.cc File.cc \
+  css.cc Date.cc Directory.cc DirectoryUtil.cc File.cc \
   Functor.cc HtmlBuf.cc HtmlStream.cc \
   html_utility.cc LineTypeParser.cc main_utility.cc Node.cc \
@@ -62 +63 @@
   Trac.cc utility.cc Vector.cc
 
-clean-local: 
+clean-local:
   rm -rf *~
 
 all-local:
-
-

trunk/lib/SvndigestVisitor.cc

@@ -37 +37 @@
 
 
-  bool SvndigestVisitor::enter(Directory& dir) 
+  bool SvndigestVisitor::enter(Directory& dir)
   {
     if (dir.ignore())
@@ -43 +43 @@
     return true;
   }
-  
 
-  void SvndigestVisitor::leave(Directory& dir) 
+
+  void SvndigestVisitor::leave(Directory& dir)
   {
     if (report_) {
@@ -54 +54 @@
     }
   }
-  
+
 
   void SvndigestVisitor::visit(File& file)
@@ -70 +70 @@
 
 }} // end of namespace svndigest and namespace theplu
-

trunk/lib/rmdirhier.cc

@@ -76 +76 @@
       // Make sure file is removable before removing it
       chmod(dir.c_str(),S_IWRITE);
-      if (remove(dir.c_str()))
+      if (::remove(dir.c_str()))
         throw FileDeleteError(concatenate_path(pwd(),dir));
       return;
@@ -98 +98 @@
     // Remove the directory from its parent
     chdir("..");
-    if (remove(dir.c_str()))
+    if (::remove(dir.c_str()))
       throw DirectoryDeleteError(concatenate_path(pwd(),dir));
   }

trunk/lib/utility.cc

@@ -28 +28 @@
 
 #include <cassert>
-#include <cerrno> 
+#include <cerrno>
 #include <cstdio>
 #include <cstdlib>
@@ -307 +307 @@
 
 
+  void remove(const std::string& fn)
+  {
+    if (::remove(fn.c_str())) {
+      std::string msg("remove: ");
+      msg += fn;
+      throw yat::utility::errno_error(msg);
+    }
+  }
+
+
   void rename(const std::string& from, const std::string to)
   {

trunk/lib/utility.h

@@ -189 +189 @@
 
   /**
+     same as C function remove but throws errno_error at failure
+
+     \see man remove
+   */
+  void remove(const std::string& fn);
+
+  /**
      same as rename(2) but throw errno if error is encountered
 
@@ -269 +276 @@
 
 }} // end of namespace svndigest end of namespace theplu
-
-#endif 
+#endif

trunk/test/Makefile.am

@@ -61 +61 @@
 
 # tests not yet passing are listed here
-XFAIL_TESTS = remove_cache_test.sh
+XFAIL_TESTS =
 
 noinst_HEADERS = Suite.h

trunk/test/remove_cache_test.sh

@@ -49 +49 @@
   || exit_fail
 test -e toy_project/empty/.svndigest && exit_fail
-test -e toy_project/dir_to_be_ignored/.svndigest && exit_fail
+test -e toy_project/dir_to_be_ignored/.svndigest || exit_fail
 
 # === testing svncopyright ===
@@ -61 +61 @@
 echo dummie > toy_project/dir_to_be_ignored/.svndigest/foo.svncopyright-cache
 
-SVNCOPYRIGHT_run 0 --root toy_project/bin --no-report
-test -r toy_project/bin/.svndigest/Parameter.cc.svncopyright-cache || exit_fail
+SVNCOPYRIGHT_run 0 --root toy_project --no-report
+test -r toy_project/bin/.svndigest/svnstat.cc.svncopyright-cache || exit_fail
 test -e toy_project/bin/.svndigest/foo.svncopyright-cache && exit_fail
 test -e toy_project/empty/.svndigest/foo.svncopyright-cache && exit_fail
@@ -68 +68 @@
   && exit_fail
 test -e toy_project/empty/.svndigest && exit_fail
-test -e toy_project/dir_to_be_ignored/.svndigest && exit_fail
+test -e toy_project/dir_to_be_ignored/.svndigest || exit_fail
 
 exit_success

trunk/yat/Makefile.am

@@ -32 +32 @@
 noinst_HEADERS += deprecate.h
 noinst_HEADERS += Exception.h
+noinst_HEADERS += FileUtil.h
 noinst_HEADERS += Option.h
 noinst_HEADERS += OptionArg.h
@@ -40 +41 @@
 
 
-yat_cc_files = 
+yat_cc_files =
 yat_cc_files += ColumnStream.cc
 yat_cc_files += CommandLine.cc
 yat_cc_files += Exception.cc
+yat_cc_files += FileUtil.cc
 yat_cc_files += Option.cc
 yat_cc_files += OptionHelp.cc