Piggy 0.4.2.4 → 0.4.3.0

data/CHANGES.txt

@@ -1,3 +1,18 @@
+Changes in 0.4.3-0
+- Bugfix (Vista): LOCAL_APPDATA path
+  solved with win32-dir
+- Bugfix (Vista): Shortcuts like "Sample pictures"
+- Bugfix: Some Unicode issues
+- More options visible to user
+- Refactorings: Ruby naming conventions
+  (and other Netbeans warnings)
+- New style "sylvester"
+- Style samples (on Piggy website)
+- Link to style samples in help menu
+- FTP-Browser layout:
+  hide connection dynamically
+  => no foursplitter necessary
+
 Changes in 0.4.2-4
 - Bugfix for opening browsers
 - Bugfix utf8 conversion of comments

data/INSTALL.txt

@@ -9,9 +9,9 @@ Intallation includes the following applications
 - directory_diff
 - ftp_browser
 
-------------------
-Windows NT/2000/XP
-------------------
+---------------------------
+Windows NT, 2000, XP, Vista
+---------------------------
 
 You might be using the Ruby Windows Installer, so you
 probably have FXRuby and most of the other required libraries
@@ -26,7 +26,8 @@ Rubygems will check if the required gems rubyzip and exifr are installed on your
 system.
 
 (Note that for now the gem command won't check if FXRuby is installed
-on your system, so you'll be able to install FXRuby via gem or from source.)
+on your system, so you'll be able to install FXRuby via gem or from source.
+FXRuby version 1.6 is recommended.)
 
 Gem installation might fail if you don't have the rights
 to write the gem directories. You'll need to become admin
@@ -130,3 +131,7 @@ In most cases, setting the HTTP_PROXY environment variable will help:
 
 For more information on this topic see
 	http://wiki.rubyonrails.org/rails/pages/GemRails
+
+If you still got problems: Download all required gems and install each with
+	gem install <downloaded_file>
+

data/README.txt

@@ -9,17 +9,19 @@ I've created this application for:
 
 
 Basically it is a simple image viewer which allows you to
-rotate and save images, select some, create an internet
-gallery with thumbnail preview and upload this gallery
-via ftp.
+- rotate and comment images (without changing the original files),
+- select some images and create an internet gallery with thumbnail preview,
+- upload this gallery via ftp.
+
+Piggy uses exif metainfo to guess initial rotations and comments.
 
 -----------
 Limitations
 -----------
 
-Piggy is currently developed under Windows 2000.
+Piggy is currently developed under Windows Vista.
 Additional tests include Windows XP and Linux.
-It is not tested on Windows Vista or Mac.
+It is not tested on Mac.
 
 Piggy is not meant as general purpose tool for image manipulations:
 - Image rotation reduces the quality of the image
@@ -30,4 +32,4 @@ Zipfile will include original images including all metadata.
 Uncheck this option if this metadata includes personal information
 that you do not want to publish.
 (See http://netzreport.googlepages.com/hidden_data_in_jpeg_files.html
-for more information on this topic.)
+for more information on this topic.)

data/bin/directory_diff

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'directory_diff'
-runDirectoryDiff
+run_directory_diff
 
 

data/bin/ftp_browser

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'ftp_browser'
-runUploader
+run_uploader
 
 

data/bin/piggy

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'piggy'
-runPiggy
+run_piggy
 
 

data/lib/directory_diff.rb

@@ -7,18 +7,18 @@
 require 'piggy-core/options_persistence'
 require 'piggy-gui/directory_diff_widget'
 
-def runDirectoryDiff
+def run_directory_diff
   # Make application
-  application = Fox::FXApp.new("Piggy Directory Diff", "Sascha D�rdelmann")
+  application = Fox::FXApp.new("Piggy Directory Diff", "Sascha D�rdelmann")
 
-  optionStore = PiggyOptionsPersistence.new
-  options = optionStore.loadYaml 
+  option_store = PiggyOptionsPersistence.new
+  options = option_store.load_yaml
  
   # Make window
   window = DirectoryDiffMainWindow.new(application, options)
   
   # Handle interrupts to terminate program gracefully
-  application.addSignal("SIGINT", window.method(:onTerminate))
+  application.addSignal("SIGINT", window.method(:on_terminate))
   
   # Create it
   application.create
@@ -28,8 +28,10 @@ def runDirectoryDiff
   application.run
 end
 
+alias :runDirectoryDiff :run_directory_diff
+
 if $0 == __FILE__
-  runDirectoryDiff
+  run_directory_diff
 end
 
 

data/lib/ftp_browser.rb

@@ -7,18 +7,18 @@
 require 'piggy-core/options_persistence'
 require 'piggy-gui/ftp_browser_widget'
 
-def runUploader
+def run_uploader
   # Make application
-  application = Fox::FXApp.new("Piggy FTP Browser", "Sascha D�rdelmann")
+  application = Fox::FXApp.new("Piggy FTP Browser", "Sascha D�rdelmann")
 
-  optionStore = PiggyOptionsPersistence.new
-  options = optionStore.loadYaml 
+  option_store = PiggyOptionsPersistence.new
+  options = option_store.load_yaml
  
   # Make window
   window = FtpBrowserMainWindow.new(application, options)
   
   # Handle interrupts to terminate program gracefully
-  application.addSignal("SIGINT", window.method(:onTerminate))
+  application.addSignal("SIGINT", window.method(:on_terminate))
   
   # Create it
   application.create
@@ -28,6 +28,8 @@ def runUploader
   application.run
 end
 
+alias :runUploader :run_uploader
+
 if $0 == __FILE__
-  runUploader
+  run_uploader
 end

data/lib/piggy-core/alive_check.rb

@@ -24,17 +24,17 @@ class AliveCheck
   def check
     checked_thread = Thread.current
     @alive = true
-    aliveChecker = Thread.new {
+    alive_checker = Thread.new {
       while(@alive) do
-	@alive = false
-	sleep(@sec)
+        @alive = false
+        sleep(@sec)
       end
       checked_thread.raise(Timeout::Error, @ex_msg) if checked_thread.alive?
     }
     begin 
       yield
     ensure
-      aliveChecker.kill if aliveChecker and aliveChecker.alive?
+      alive_checker.kill if alive_checker and alive_checker.alive?
     end
   end
 

data/lib/piggy-core/debug.rb

@@ -2,20 +2,20 @@
 
 # Global methods temporaryly used for debugging.
 # Inspired by the book
-# "Programmieren mit Ruby" by R�hrl/Schmiedl/Weyss"
+# "Programmieren mit Ruby" by R�hrl/Schmiedl/Weyss"
 
-def beginTrace
+def begin_trace
   $stderr.puts "Begin Trace in: #{caller.first}"
   set_trace_func proc {
     |event, file, line, id, binding, classname|
     unless File.basename(file) == 'debug.rb'
       $stderr.printf("%8s %s-, %-2d %10s %8s\n",
-      event, file, line, id, classname)
+        event, file, line, id, classname)
     end
   }
 end
 
-def endTrace
+def end_trace
   $stderr.set_trace_func(nil)
   puts "End Trace in: #{caller.first}"
 end

data/lib/piggy-core/environment.rb

@@ -19,42 +19,29 @@
 # paths relative to PIGGY_PATH.
 
 begin
-  require 'rubygems'
-  require 'piggy-core/version.rb'
-  
   # Try to find lib directory of this specific Piggy gem version
-  def findPiggyDirectory
-    puts "Checking $LOAD_PATH"
-    $LOAD_PATH.each do
-      |d|
-      if /piggy.lib$/ =~ d
-        return d.gsub(/\\/, '/')
-      end
-    end
-    puts "Checking Gems"
-    piggyGemDir = "Piggy-#{PiggyVersion.versionString.gsub(/-/, '.')}"
-    all = Gem::path.collect { |gempath|
-      File.join(gempath, 'gems', piggyGemDir)
-    }.select { |f|
-      File.directory?(f)
-    }
-    return all.empty? ? '.' : File.join(all.first, 'lib')
+  def find_piggy_directory
+    require 'rubygems'
+    require 'piggy-core/winshell'
+    require 'piggy-core/file_info'
+    return FilePath.one_dir_up(File.dirname(WinShell.instance.ruby_path(__FILE__)))
   end
-  PIGGY_PATH = findPiggyDirectory
-  puts "Successfully detecting piggy gem lib in #{PIGGY_PATH}"
+  PIGGY_PATH = find_piggy_directory
+  puts "Successfully detected piggy gem lib in #{PIGGY_PATH}"
 rescue LoadError
-  PIGGY_PATH = '.'
+  PIGGY_PATH = "#{__FILE__}/.."
+  puts "Workaround for LoadError; assuming piggy gem lib is #{PIGGY_PATH}"
 end
 
 # Temporary change working dir while executing a given block
-# (depriciated)
-def inPath(path, &block)
-  workingDirSik = Dir.getwd
+# (deprecated)
+def in_path(path, &block)
+  working_dir_sik = Dir.getwd
   begin
     Dir.chdir(path)
     block.call
   ensure
-    Dir.chdir(workingDirSik)
+    Dir.chdir(working_dir_sik)
   end
 end
 
@@ -64,3 +51,14 @@ begin
 rescue LoadError
   RMAGICK_AVAILIABLE = false
 end
+
+def get_style_list
+  style_dir = File.join(PIGGY_PATH, 'templates/styles')
+  Dir[File.join(style_dir, '*')].entries.reject {
+    |f|
+    f =~ /^\.+$/
+  }.collect {
+    |folder|
+    File.basename(folder)
+  }
+end

data/lib/piggy-core/exifr_adapter.rb

@@ -7,7 +7,7 @@ require 'exifr'
 # layer between Piggy and EXIFR.
 class ExifrAdapter
   def initialize(file)
-    @exif = loadExif(file)
+    @exif = load_exif(file)
   end
 
   def exif?
@@ -31,7 +31,7 @@ class ExifrAdapter
     elsif @exif.comment.class == Array
       desc += "\tcomments: "
       @exif.comment.each { |c|
-	desc += "\t\t#{c}\n"
+        desc += "\t\t#{c}\n"
       }
     end
     return desc unless @exif.exif?
@@ -41,13 +41,13 @@ class ExifrAdapter
     return desc
   end
 
-  def viewDegrees
+  def view_degrees
     return 0 unless exif?
     orientation = @exif.exif[:orientation]
     return 0 if orientation.nil?
-    imageMock = ExifrDegreeComuter.new
-    orientation.transform_rmagick(imageMock)
-    return imageMock.degree
+    image_mock = ExifrDegreeComuter.new
+    orientation.transform_rmagick(image_mock)
+    return image_mock.degree
   end
 
   def width
@@ -60,19 +60,19 @@ class ExifrAdapter
 
   private
 
-  def loadExif(file)
-    if(hasExtension?(file, 'jpg'))
+  def load_exif(file)
+    if(has_extension?(file, 'jpg'))
       EXIFR::JPEG.new(file)
-    elsif(hasExtension?(file, 'tif'))
+    elsif(has_extension?(file, 'tif'))
       EXIFR::TIFF.new(file)
     else
       nil
     end
   end
 
-  def hasExtension?(filename, ext)
+  def has_extension?(filename, ext)
     File.basename(filename.upcase, ext.upcase) !=
-    File.basename(filename.upcase)
+      File.basename(filename.upcase)
   end
 end
 

data/lib/piggy-core/file_info.rb

@@ -9,10 +9,10 @@ module FilePath
   
   # Ruby path notation for a given operation system/file system
   # specific path
-  def FilePath.internPath(pathString)
-    return '' unless pathString
-    newPath = pathString.gsub(/\\/, File::SEPARATOR)
-    return newPath =~ /:$/ ? newPath + File::SEPARATOR : newPath
+  def FilePath.intern_path(path_string)
+    return '' unless path_string
+    new_path = path_string.gsub(/\\/, File::SEPARATOR)
+    return new_path =~ /:$/ ? new_path + File::SEPARATOR : new_path
   end
   
   # Just as File.join but handles at least one possible error.
@@ -23,30 +23,30 @@ module FilePath
   def FilePath.join(string1, string2)
     return string2 unless string1 && !string1.empty?
     return string1 unless string2 && !string2.empty?
-    noLeadingSeps2 = string2.sub(Regexp.compile("#{File::SEPARATOR}*"), '')
-    return File.join(string1, noLeadingSeps2)
+    no_leading_seps2 = string2.sub(Regexp.compile("#{File::SEPARATOR}*"), '')
+    return File.join(string1, no_leading_seps2)
   end
   
   # Sections of a given pathString
-  def FilePath.split(pathString)
-    pathString.split(File::SEPARATOR)
+  def FilePath.split(path_string)
+    path_string.split(File::SEPARATOR)
   end
   
   # Removes the last section of a given pathString.
   # Won't remove a section of a file system root.
   # Possible roots are '/', 'C:', 'X:/', ...
-  def FilePath.oneDirUp(pathString)
-    return '' unless pathString
-    sections = FilePath.split(pathString)
+  def FilePath.one_dir_up(path_string)
+    return '' unless path_string
+    sections = FilePath.split(path_string)
     return '' unless sections || !sections.empty?
     if sections.size == 1
-      return pathString if pathString =~ /:/
-      return pathString if pathString == '/'
+      return path_string if path_string =~ /:/
+      return path_string if path_string == '/'
       return ''
     end
     return '' unless sections[-1]
-    numOfCharsToStrip = sections[-1].size + 2
-    return FilePath.internPath(pathString[0..-numOfCharsToStrip])
+    num_of_chars_to_strip = sections[-1].size + 2
+    return FilePath.intern_path(path_string[0..-num_of_chars_to_strip])
   end
 end
 
@@ -57,24 +57,24 @@ class FileName
   attr_accessor(:name)
   attr_reader(:path)
   
-  def initialize(theName, thePath = '')
-    @name = theName
-    setPath(thePath)
+  def initialize(the_name, the_path = '')
+    @name = the_name
+    set_path(the_path)
   end
   
-  def path=(newPath)
-    setPath(newPath)
+  def path=(new_path)
+    set_path(new_path)
   end
   
-  def setPath(newPath)
-    @path = FilePath.internPath(newPath)
+  def set_path(new_path)
+    @path = FilePath.intern_path(new_path)
   end
   
-  def nameWithPath
+  def name_with_path
     return FilePath.join(path, name)
   end
   
-  def nameWithoutExtension
+  def name_without_extension
     return File.basename(name, '.' + extension)
   end
   
@@ -82,7 +82,7 @@ class FileName
     return name.split('.')[-1]
   end
   
-  def pathSections
+  def path_sections
     return FilePath.split(path)
   end
 end
@@ -95,31 +95,31 @@ end
 class FileInfo < FileName
   attr_accessor(:size, :mtime, :ctime)
   
-  def initialize(theName, thePath = '')
-    super(theName, thePath)
+  def initialize(the_name, the_path = '')
+    super(the_name, the_path)
     @size = 0
-    @isDirectory = false
+    @is_directory = false
   end
   
   def directory?
-    return @isDirectory
+    return @is_directory
   end
   
   def directory!
-    @isDirectory = true
+    @is_directory = true
   end
   
-  def mtimeString
-    timeStringFor(mtime)
+  def mtime_string
+    time_string_for(mtime)
   end
   
-  def ctimeString
-    timeStringFor(ctime)
+  def ctime_string
+    time_string_for(ctime)
   end
   
   protected
   
-  def timeStringFor(time)
+  def time_string_for(time)
     return 'unknown' unless time
     time.strftime("%m/%d/%Y at %I:%M%p")
   end
@@ -128,9 +128,9 @@ end
 class CommentedFile < FileInfo
   attr_accessor(:comment, :rotation, :width, :height)
 
-  def initialize(theName, thePath = '', theComment = '')EXIFR
-    super(theName, thePath)
-    @comment = theComment
+  def initialize(the_name, the_path = '', the_comment = '')
+    super(the_name, the_path)
+    @comment = the_comment
     @rotation = 0
     @width = 0
     @height = 0
@@ -146,29 +146,29 @@ end
 class DirectoryContents
   attr_accessor(:path)
   
-  def initialize(thePath = '')
-    @path = thePath
+  def initialize(the_path = '')
+    @path = the_path
     @contents = Hash.new
   end
   
-  def add(aFileName)
-    @contents[aFileName.name] = aFileName
+  def add(file_name)
+    @contents[file_name.name] = file_name
   end
   
-  def []=(aName, info)
-    @contents[aName] = info
+  def []=(name, info)
+    @contents[name] = info
   end
   
-  def get(aFileName)
-    return @contents[aFileName.name]
+  def get(file_name)
+    return @contents[file_name.name]
   end
   
-  def at(aName)
-    return @contents[aName]
+  def at(name)
+    return @contents[name]
   end
   
-  def [](aName)
-    return @contents[aName]
+  def [](name)
+    return @contents[name]
   end
   
   alias has_key? []
@@ -195,22 +195,22 @@ class FileRepository
     @repository = Hash.new
   end
   
-  def add(aFileName)
-    self[aFileName] = aFileName
+  def add(file_name)
+    self[file_name] = file_name
   end
   
-  def []=(aFileName, info)
-    hashOrNil =  @repository[aFileName.path]
-    if hashOrNil == nil
-      hashOrNil = Hash.new
-      @repository[aFileName.path] = hashOrNil
+  def []=(file_name, info)
+    hash_or_nil =  @repository[file_name.path]
+    if hash_or_nil == nil
+      hash_or_nil = Hash.new
+      @repository[file_name.path] = hash_or_nil
     end
-    hashOrNil[aFileName.name] = info
+    hash_or_nil[file_name.name] = info
   end
   
-  def get(aFileName)
-    subHash = @repository[aFileName.path]
-    return subHash == nil ? nil : subHash[aFileName.name]
+  def get(file_name)
+    sub_hash = @repository[file_name.path]
+    return sub_hash == nil ? nil : sub_hash[file_name.name]
   end
   alias [] get
   alias has_key? get