Commit 2408c7a5 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Resolved files-with-same-name problem. 

Add a number to the end of the original filename until we get
a unique name.
parent 2d7e6641

lib/jsduck/source_formatter.rb

+13 −3
Original line number Diff line number Diff line
@@ -16,13 +16,23 @@ module JsDuck 
    # Converts source to HTML and writes into file in output

    # directory.  It returns the name of the file that it wrote.

    def write(source, filename)

      fname = html_filename(filename)

      fname = uniq_html_filename(filename)

      File.open(fname, 'w') {|f| f.write(format(source)) }

      fname

    end



    def html_filename(filename)

      @output_dir + "/" + File.basename(filename, ".js") + ".html"

    def uniq_html_filename(filename)

      fname = html_filename(filename)

      nr = 1

      while File.exists?(fname)

        nr += 1

        fname = html_filename(filename, nr)

      end

      fname

    end



    def html_filename(filename, nr=0)

      @output_dir + "/" + File.basename(filename, ".js") + (nr > 0 ? nr.to_s : "") + ".html"

    end



    # Returns full source for HTML page

spec/source_formatter_spec.rb

+4 −0
Original line number Diff line number Diff line
@@ -33,5 +33,9 @@ describe JsDuck::SourceFormatter do 
      @formatter.html_filename("foo.js").should == "some/dir/foo.html"

    end



    it "Adds number to filename if provided" do

      @formatter.html_filename("foo.js", 2).should == "some/dir/foo2.html"

    end



  end

end