diff --git a/src/libprs500/ebooks/metadata/__init__.py b/src/libprs500/ebooks/metadata/__init__.py index 6c999195fa..e29692347f 100644 --- a/src/libprs500/ebooks/metadata/__init__.py +++ b/src/libprs500/ebooks/metadata/__init__.py @@ -68,4 +68,4 @@ class MetaInformation(object): return ans.strip() def __nonzero__(self): - return self.title or self.author or self.comments or self.category \ No newline at end of file + return bool(self.title or self.author or self.comments or self.category) \ No newline at end of file diff --git a/src/libprs500/ebooks/metadata/pdf-meta.pl b/src/libprs500/ebooks/metadata/pdf-meta.pl deleted file mode 100644 index 991873045a..0000000000 --- a/src/libprs500/ebooks/metadata/pdf-meta.pl +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/perl -# Read/Write PDF meta data -# Based on pdf-meta from http://www.osresearch.net/wiki/index.php/Pdf-meta - -use warnings; -use strict; -use PDF::API2; -use Getopt::Long; -use Data::Dumper; - -my %new_info = (Creator => 'libprs500.metadata', CreationDate => scalar( localtime ),); - -GetOptions( - "c|creator=s" => \$new_info{Creator}, - "d|date=s" => \$new_info{CreationDate}, - "p|producer=s" => \$new_info{Producer}, - "a|author=s" => \$new_info{Author}, - "s|subject=s" => \$new_info{Subject}, - "k|keywords=s" => \$new_info{Keywords}, - "t|title=s" => \$new_info{Title}, -) or die "Usage: (no help yet!)\n"; - - - -for my $file (@ARGV) -{ - my $pdf = PDF::API2->open( $file ) - or warn "Unable to open $file: $!\n" - and next; - - my %info = $pdf->info; - for my $key (keys %info) - { - print $key.' = """'.$info{$key}.'"""'."\n"; - } - print "\n"; - - for my $key (keys %new_info) - { - my $new_value = $new_info{$key}; - next unless defined $new_value; - - $info{$key} = $new_value; - } - - $pdf->info( %info ); - $pdf->saveas( $file ); -} - diff --git a/src/libprs500/ebooks/metadata/pdf.py b/src/libprs500/ebooks/metadata/pdf.py index eeae0bb378..c0596e930e 100644 --- a/src/libprs500/ebooks/metadata/pdf.py +++ b/src/libprs500/ebooks/metadata/pdf.py @@ -56,7 +56,7 @@ def set_metadata(path, options): return True def get_metadata_from_file(path, default_mi=None): - if not default_mi: + if default_mi is None: title = os.path.splitext(os.path.basename(path))[0] mi = MetaInformation(title, 'Unknown') else: