Some improvements

Author: JakobDev

routers/web/shared/packages/upload.go

@@ -36,10 +36,10 @@ func addRepoToUploadedPackage(ctx *context.Context, packageType, repoName string
 		if repo_model.IsErrRepoNotExist(err) {
 			servePackageUploadError(ctx, fmt.Errorf("repo not found"), packageType, repoName)
 			return false
-		} else {
-			ctx.ServerError("GetRepositoryByOwnerAndName", err)
-			return false
 		}
+
+		ctx.ServerError("GetRepositoryByOwnerAndName", err)
+		return false
 	}
 
 	err = packages_model.SetRepositoryLink(ctx, packageID, repo.ID)
@@ -66,6 +66,13 @@ func UploadGenericPackagePost(ctx *context.Context) {
 	}
 	defer buf.Close()
 
+	var filename string
+	if form.PackageFilename == "" {
+		filename = form.PackageFile.Filename
+	} else {
+		filename = form.PackageFilename
+	}
+
 	pv, _, err := packages_service.CreatePackageOrAddFileToExisting(
 		&packages_service.PackageCreationInfo{
 			PackageInfo: packages_service.PackageInfo{
@@ -78,7 +85,7 @@ func UploadGenericPackagePost(ctx *context.Context) {
 		},
 		&packages_service.PackageFileCreationInfo{
 			PackageFileInfo: packages_service.PackageFileInfo{
-				Filename: form.PackageFilename,
+				Filename: filename,
 			},
 			Creator: ctx.Doer,
 			Data:    buf,

templates/package/upload/debian.tmpl

@@ -1,4 +1,5 @@
 <div class="ui">
+	<h1>Upload Debian Package</h1>
 	{{template "base/alert" .}}
 	<form class="ui form" action="{{.Link}}/upload" method="post" enctype="multipart/form-data">
 		{{.CsrfTokenHtml}}
@@ -15,8 +16,8 @@
 			<input id="package_component" name="package_version" placeholder="The Component" maxlength="50" required>
 		</div>
 
-		<div class="inline field gt-pl-4">
-			<label for="package_file">The Package</label>
+		<div class="field">
+			<label for="package_file">The Package:</label>
 			<input name="package_file" type="file" accept=".deb" required>
 		</div>
 

templates/package/upload/generic.tmpl

@@ -1,4 +1,5 @@
 <div class="ui">
+	<h1>Upload Generic Package</h1>
 	{{template "base/alert" .}}
 	<form class="ui form" action="{{.Link}}/upload" method="post" enctype="multipart/form-data">
 		{{.CsrfTokenHtml}}
@@ -17,11 +18,11 @@
 
 		<div class="field">
 			<label for="package_filename">Filename:</label>
-			<input id="package_filename" name="package_filename" placeholder="The filename" maxlength="50" required>
+			<input id="package_filename" name="package_filename" placeholder="The filename (leave empty to use name from uploaded file)" maxlength="50">
 		</div>
 
-		<div class="inline field gt-pl-4">
-			<label for="package_file">The Package</label>
+		<div class="field">
+			<label for="package_file">The Package:</label>
 			<input name="package_file" type="file" required>
 		</div>