Optimize diff for selected files

Author: EdwardBlair

client/snapper/MyFiles.cc

@@ -101,12 +101,4 @@ namespace snapper
 	}
     }
 
-
-    void
-    MyFiles::bulk_process(FILE* file, GetOpts& get_opts, std::function<void(File& file)> callback)
-    {
-	bool all = !file && get_opts.num_args() == 0;
-	bulk_process(get_requested_files(file, get_opts), all, callback);
-    }
-
 }

client/snapper/MyFiles.h

@@ -41,8 +41,6 @@ namespace snapper
 	void bulk_process(const vector<string>& filenames, bool all,
 			  std::function<void(File& file)> callback);
 
-	void bulk_process(FILE* file, GetOpts& get_opts, std::function<void(File& file)> callback);
-
     };
 
 }

client/snapper/cmd-diff.cc

@@ -98,11 +98,16 @@ namespace snapper
 	pair<ProxySnapshots::const_iterator, ProxySnapshots::const_iterator> range =
 	    snapshots.findNums(get_opts.pop_arg());
 
-	ProxyComparison comparison = snapper->createComparison(*range.first, *range.second, true);
+	bool selected = file || get_opts.num_args() > 0;
+	vector<string> filenames = MyFiles::get_requested_files(file, get_opts);
+
+	ProxyComparison comparison = selected ?
+	    snapper->createComparison(*range.first, *range.second, true, filenames) :
+	    snapper->createComparison(*range.first, *range.second, true);
 
 	MyFiles files(comparison.getFiles());
 
-	files.bulk_process(file, get_opts, [differ](const File& file) {
+	files.bulk_process(filenames, !selected, [differ](const File& file) {
 	    differ.run(file.getAbsolutePath(LOC_PRE), file.getAbsolutePath(LOC_POST));
 	});
     }

client/snapper/cmd-xadiff.cc

@@ -86,22 +86,25 @@ namespace snapper
 	pair<ProxySnapshots::const_iterator, ProxySnapshots::const_iterator> range =
 	    snapshots.findNums(get_opts.pop_arg());
 
-	ProxyComparison comparison = snapper->createComparison(*range.first, *range.second, true);
+	bool selected = get_opts.num_args() > 0;
+	vector<string> filenames = MyFiles::get_requested_files(NULL, get_opts);
+
+	ProxyComparison comparison = selected ?
+	    snapper->createComparison(*range.first, *range.second, true, filenames) :
+	    snapper->createComparison(*range.first, *range.second, true);
 
 	MyFiles files(comparison.getFiles());
 
-	if (get_opts.num_args() == 0)
+	if (!selected)
 	{
 	    for (Files::const_iterator it1 = files.begin(); it1 != files.end(); ++it1)
 		if (it1->getPreToPostStatus() & XATTRS)
 		    print_xadiff(it1->getAbsolutePath(LOC_PRE), it1->getAbsolutePath(LOC_POST));
 	}
 	else
 	{
-	    while (get_opts.num_args() > 0)
+	    for (const string& name : filenames)
 	    {
-		string name = get_opts.pop_arg();
-
 		Files::const_iterator it1 = files.findAbsolutePath(name);
 		if (it1 == files.end())
 		    continue;