Revert extended names for imported files and fix related test #56

Dockerfile

@@ -1,4 +1,4 @@
-FROM photoprism/development:20190629
+FROM photoprism/development:20190702
 
 # Set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"

docker/photoprism/Dockerfile

@@ -1,4 +1,4 @@
-FROM photoprism/development:20190629 as build
+FROM photoprism/development:20190702 as build
 
 # Set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"

internal/config/test.go

@@ -18,7 +18,7 @@ import (
 const (
 	TestDataZip  = "/tmp/photoprism/testdata.zip"
 	TestDataURL  = "https://dl.photoprism.org/fixtures/testdata.zip"
-	TestDataHash = "1a59b358b80221ab3e76efb683ad72402f0b0844"
+	TestDataHash = "6614759b9e0ec2ba3bf926c7629d1f1c89008cbd"
 )
 
 var testConfig *Config

internal/photoprism/importer.go

@@ -152,12 +152,6 @@ func (i *Importer) ImportPhotosFromDirectory(importPath string) {
 // DestinationFilename get the destination of a media file.
 func (i *Importer) DestinationFilename(mainFile *MediaFile, mediaFile *MediaFile) (string, error) {
 	fileName := mainFile.CanonicalName()
-	baseName := mainFile.Basename()
-
-	if fileName != baseName {
-		fileName += "." + baseName
-	}
-
 	fileExtension := mediaFile.Extension()
 	dateCreated := mainFile.DateCreated()
 

internal/photoprism/mediafile_test.go

@@ -63,9 +63,9 @@ func TestMediaFile_EditedFilename(t *testing.T) {
 
 	ctx.InitializeTestData(t)
 
-	mediaFile1, err := NewMediaFile(ctx.ImportPath() + "/iphone/IMG_6788.JPG")
+	mediaFile1, err := NewMediaFile(ctx.ImportPath() + "/iphone/IMG_4120.JPG")
 	assert.Nil(t, err)
-	assert.Equal(t, ctx.ImportPath()+"/iphone/IMG_E6788.JPG", mediaFile1.EditedFilename())
+	assert.Equal(t, ctx.ImportPath()+"/iphone/IMG_E4120.JPG", mediaFile1.EditedFilename())
 
 	/* TODO: Add example files to import.zip
 	mediaFile2, err := NewMediaFile("/foo/bar/IMG_E1234.jpg")