Merge branch 'master' of git.workaround.org:chaas/debshots

This commit is contained in:
Christoph Haas 2016-11-03 13:23:15 +01:00
parent 396f3a7751
commit 2189f8cc81
4 changed files with 9 additions and 32 deletions

View file

@ -35,7 +35,7 @@ class PackagesController < ApplicationController
# Save the images already if they are valid. # Save the images already if they are valid.
# params[:screenshot][:image].each do |img| # params[:screenshot][:image].each do |img|
successful_upload_count = 0 # successful_upload_count = 0
params[:file].each do |img| params[:file].each do |img|
new_screenshot = @package.screenshots.new(image: img) new_screenshot = @package.screenshots.new(image: img)

View file

@ -8,7 +8,7 @@
' You are about to upload a screenshot for the #{@package.name} ' You are about to upload a screenshot for the #{@package.name}
' package. Thanks for your contribution. ' package. Thanks for your contribution.
= form_tag(upload_image_path, multipart: true) = form_for :screenshot, url: upload_image_path, html: { multipart: true, id: 'file-form' } do |f|
.row .row
.small-6.columns .small-6.columns
@ -33,21 +33,6 @@
a.black.fancybox href=ss.image.url(:large, timestamp: false) rel='fancybox-thumb' title=ss.caption a.black.fancybox href=ss.image.url(:large, timestamp: false) rel='fancybox-thumb' title=ss.caption
= image_tag(ss.image.url(:thumb, timestamp: false), alt: ss.caption, class: 'thumbnail') = image_tag(ss.image.url(:thumb, timestamp: false), alt: ss.caption, class: 'thumbnail')
// <<<<<<< HEAD
= form_for :screenshot, url: upload_image_path, html: { multipart: true, id: 'file-form' } do |f|
/ = form_tag(upload_image_path, multipart: true, id: 'file-form')
.row
.small-6.columns
/ input.hidden-inputfile type="file" name="image" id="file" multiple=true
= f.file_field :image, id: 'file', multiple: true, class: 'hidden-inputfile'
label for="file"
a.button id="file-select-button"
= fa_stacked_icon "image", base: "circle-thin"
span id="file-label"
' Select screenshot files
// =======
// = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg } // = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg }
//- else //- else

View file

@ -7,10 +7,7 @@ DB_HOST=localhost
#DB_HOST=torf #DB_HOST=torf
echo Getting screenshot files echo Getting screenshot files
rsync -v --size-only root@screenshots.debian.net:/home/debshots/debshots-screenshots.tar /tmp rsync -av debshots@roy.workaround.org:debshots/public/screenshots/ public/screenshots/
echo Getting PostgreSQL dump
rsync -v --size-only root@screenshots.debian.net:/home/debshots/debshots.sql /tmp
echo Dropping existing database echo Dropping existing database
set +e set +e
@ -24,18 +21,13 @@ psql -h $DB_HOST postgres debshots -c 'create database debshots owner debshots'
psql -h $DB_HOST postgres debshots -c 'create database debshots_dev owner debshots' psql -h $DB_HOST postgres debshots -c 'create database debshots_dev owner debshots'
psql -h $DB_HOST postgres debshots -c 'create database debshots_test owner debshots' psql -h $DB_HOST postgres debshots -c 'create database debshots_test owner debshots'
echo Getting PostgreSQL dump
ssh root@roy.workaround.org 'pg_dump debshots' > /tmp/debshots.sql
echo Restoring PostgreSQL dump echo Restoring PostgreSQL dump
psql -h $DB_HOST debshots debshots < /tmp/debshots.sql psql -h $DB_HOST debshots debshots < /tmp/debshots.sql
psql -h $DB_HOST debshots_dev debshots < /tmp/debshots.sql psql -h $DB_HOST debshots_dev debshots < /tmp/debshots.sql
psql -h $DB_HOST debshots_test debshots < /tmp/debshots.sql psql -h $DB_HOST debshots_test debshots < /tmp/debshots.sql
echo Unpacking screenshots tarball bundle exec rake db:migrate
#cd ../public
#cd $IMAGE_DEST
tar -C $IMAGE_DEST -xf /tmp/debshots-screenshots.tar
#mv public/live/screenshots/approved public/screenshots
#rm -r public/live
ln -fs public/live/screenshots/approved public/screenshots
rake db:migrate

View file

@ -19,8 +19,8 @@ Debshots::Application.routes.draw do
get 'package/:name' => 'packages#details', as: :package, name: /[^\/]+/ get 'package/:name' => 'packages#details', as: :package, name: /[^\/]+/
get 'package_reviews/:name' => 'packages#reviews', as: :package_reviews, name: /[^\/]+/ get 'package_reviews/:name' => 'packages#reviews', as: :package_reviews, name: /[^\/]+/
get 'upload', to: redirect('/packages'), as: :upload_legacy # legacy upload form get 'upload', to: redirect('/packages'), as: :upload_legacy # legacy upload form
post 'uploadfile' => 'packages#legacy_uploadfile' post 'uploadfile' => 'packages#legacy_uploadfile', name: /[^\/]+/
get 'upload/:name' => 'packages#upload', as: :upload get 'upload/:name' => 'packages#upload', as: :upload, name: /[^\/]+/
post 'upload_image/:name' => 'packages#upload_image', as: :upload_image, name: /[^\/]+/ post 'upload_image/:name' => 'packages#upload_image', as: :upload_image, name: /[^\/]+/
# TODO: "get" is probably the wrong method to delete a screenshot # TODO: "get" is probably the wrong method to delete a screenshot
get 'delete_screenshot/:id' => 'packages#delete_screenshot', as: :delete_screenshot get 'delete_screenshot/:id' => 'packages#delete_screenshot', as: :delete_screenshot