X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bibtex_to_paper;h=d5c6bb1e37c7fb638adcbd0db64783ca43c97f90;hb=3d5241a316e3ff729b19b878b0841558120f75e9;hp=eee5f0a28c6ea95c96e1097777aa8a5d2f2baba2;hpb=d12330f16e1987fbab705658bdb52094d4e83e4d;p=bin.git

diff --git a/bibtex_to_paper b/bibtex_to_paper
index eee5f0a..d5c6bb1 100755
--- a/bibtex_to_paper
+++ b/bibtex_to_paper
@@ -91,6 +91,7 @@ my %options = (debug           => 0,
                man             => 0,
                only_print      => 0,
                search_by_pmid  => 0,
+               use_git         => 1,
                'bibtex_cache'  => File::Spec->catfile(User->Home,'.bibtex_to_paper_cache'),
               );
 
@@ -99,6 +100,7 @@ GetOptions(\%options,
            'bibtex|b=s@',
            'bibtex_cache|bibtex-cache|c=s',
            'pdfviewer|p=s',
+           'use_git|use-git!',
            'only_print|only-print!',
            'search_by_pmid|search-by-pmid!',
            'clear_cache|clear-cache!',
@@ -187,21 +189,27 @@ sub load_papers_into_database {
 
     my @dirs = ref($dir)?@{$dir}:$dir;
 
-    my $actually_load_it = sub {
-        if (/\.git/) {
-            $File::Find::prune = 1;
-            return;
-        }
-        return unless /\.pdf$/;
-        my $xoj = 0;
-        if (-e "${_}.xoj") {
-            $xoj = 1;
+    if ($options{use_git}) {
+        my @files = grep /\.pdf\"?$/, split /\n/, qx(git ls-tree HEAD -r --full-name --name-only);
+        for my $file  (@files) {
+            $file =~ s/^\"(.+)\"$/"qq($1)"/gee;
+            insert_or_replace_papers($dbh,$sth,basename($file),File::Spec->rel2abs($file), -e "${file}.xoj");
         }
-        insert_or_replace_papers($dbh,$sth,basename($File::Find::name),File::Spec->rel2abs($_),$xoj);
-    };
-
-    my @pdfs;
-    find($actually_load_it,@dirs);
+    } else {
+        my $actually_load_it = sub {
+            if (/\.git/) {
+                $File::Find::prune = 1;
+                return;
+            }
+            return unless /\.pdf$/;
+            my $xoj = 0;
+            if (-e "${_}.xoj") {
+                $xoj = 1;
+            }
+            insert_or_replace_papers($dbh,$sth,basename($File::Find::name),File::Spec->rel2abs($_),$xoj);
+        };
+        find($actually_load_it,@dirs);
+    }
 }
 
 sub insert_or_replace_papers {
@@ -258,11 +266,11 @@ sub fork_exec {
 sub open_pdf {
     my ($file_name,$options,$has_xoj) = @_;
     print STDERR "opening $file_name\n" if $DEBUG;
-    if ($has_xoj) {
-        fork_exec('xournal',$file_name);
-    } else {
-        fork_exec('xournal',$file_name)
+    my $pdf_viewer = 'xournal';
+    if (exists $options->{pdfviewer} and defined $options->{pdfviewer}) {
+        $pdf_viewer = $options->{pdfviewer};
     }
+    fork_exec($pdf_viewer,$file_name);
 }
 
 sub open_browser{