Iks branch merge #50
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,4 @@ app/config/parameters.yml | |
| nbproject | ||
| .idea | ||
| vagrant/.vagrant | ||
| .DS_Store | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,197 @@ | ||
| #!/bin/bash | ||
|
|
||
| cd $(dirname $0) | ||
|
|
||
| # use * for newest available locally | ||
| RABBITVERSION="2.4.0" | ||
|
|
||
| # one per line | ||
| MIRRORS="https://s3-eu-west-1.amazonaws.com/patched-jackrabbit/ | ||
| http://mirror.switch.ch/mirror/apache/dist//jackrabbit/$RABBITVERSION" | ||
|
|
||
| action="$1"; shift | ||
| args="$*" | ||
|
|
||
| pidfile=${TMPDIR:-/tmp}/jack.pid | ||
|
|
||
| JAR= | ||
|
|
||
| usage() { | ||
| echo "usage: $(basename $0) <action> [args]" | ||
| echo | ||
| echo "actions:" | ||
| echo -e " start\t\tStarts jackrabbit in the background with the given arguments" | ||
| echo -e " stop\t\tStops jackrabbit" | ||
| echo -e " restart\tRestarts jackrabbit" | ||
| echo -e " status\tPrint current status of jackrabbit (running, stopped)" | ||
| echo -e " log\t\tTails the logfile" | ||
| echo -e " clear\t\tResets index" | ||
| echo -e " flush\t\tWipes the db" | ||
| echo -e " flush:article\tRemoves today's articles (alternatively, use 'all' for removing all articles or pass the subpath to delete, e.g., '2011/04/26')" | ||
|
|
||
| } | ||
|
|
||
| if [ -z "$action" ]; then | ||
| usage | ||
| exit 1 | ||
| fi | ||
|
|
||
| # kills jackrabbit and sleeps till process dies | ||
| # prints the id of the process previously active process (or empty if it wasn't running) | ||
| stop_jackrabbit() { | ||
| local id=$(cat $pidfile 2>/dev/null) | ||
|
|
||
| if [ -n "$id" ]; then | ||
| kill $id 2>/dev/null | ||
|
|
||
| # wait till process dies | ||
| kill -0 $id | ||
| while [[ $? -eq 0 ]]; do | ||
| sleep 1 | ||
| kill -0 $id 2>/dev/null | ||
| done | ||
| fi | ||
| rm -f $pidfile | ||
| echo $id | ||
| } | ||
|
|
||
| verify_jackrabbit() { | ||
| local name="jackrabbit-standalone-$RABBITVERSION.jar" | ||
| JAR="$(ls -1 $name 2>/dev/null | tail -n 1)" | ||
|
|
||
| if [ -z "$JAR" ]; then | ||
| if [ "$RABBITVERSION" = "*" ]; then | ||
| echo "No file found matching $name" | ||
| echo "Get it at http://mirror.switch.ch/mirror/apache/dist/jackrabbit/" | ||
| exit 1 | ||
| fi | ||
|
|
||
| read -p "$name not found. Download? [y/N] " | ||
| echo | ||
| if [[ ! $REPLY =~ [Yy] ]]; then | ||
| exit | ||
| fi | ||
| JAR="$name" | ||
|
|
||
| echo "Be patient, this might take a minute..." | ||
| for m in $MIRRORS; do | ||
| url="${m%/}/$name" | ||
| echo -n "Downloading from $url" | ||
| code=$(curl -w %{http_code} -s $url -o jackrabbit.jar.tmp) | ||
| if [ $code != "200" ]; then | ||
| echo " [FAILED: $code]" | ||
| continue | ||
| fi | ||
| echo " [OKAY]" | ||
| mv jackrabbit.jar.tmp $name | ||
| done | ||
| rm -f jackrabbit.jar.tmp | ||
| fi | ||
| } | ||
|
|
||
| # starts jackrabbit in the background | ||
| start_jackrabbit() { | ||
|
|
||
| verify_jackrabbit | ||
|
|
||
| if [ -e "$JAR" ]; then | ||
|
|
||
| # already running? | ||
| if [ -e $pidfile ]; then | ||
| echo "jackrabbit seems to be running ($pidfile)" | ||
| echo "Use \`jack restart\` or \`jack stop\`" | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "Starting in the background using: $JAR" | ||
| java -Xmx512m -Xms512m -jar $JAR $args & | ||
| echo $! > $pidfile | ||
|
|
||
| else | ||
| echo "File not found: $JAR" | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| status_jackrabbit() { | ||
| if [ ! -e $pidfile ]; then | ||
| echo "Not running ($pidfile not found)" | ||
| else | ||
| echo "Running ($pidfile says $(cat $pidfile))" | ||
| fi | ||
| } | ||
|
|
||
|
|
||
| case "$action" in | ||
| clear) | ||
| wasrunning=$(stop_jackrabbit) | ||
| rm -rf jackrabbit/repository/index | ||
| rm -rf jackrabbit/workspaces/nzz/index | ||
| rm -rf jackrabbit/workspaces/nzz_test/index | ||
| echo 'Cleared repository and workspace.' | ||
| [ $wasrunning ] && start_jackrabbit | ||
| ;; | ||
| flush:article) | ||
| [ -z $args ] && args=$(date +%Y/%m/%d) | ||
| [ $args = "all" ] && args="" | ||
| # TODO extract port from $args | ||
| curl -X DELETE http://admin:admin@localhost:8080/server/nzz/jcr:root/article/$args | ||
| ;; | ||
|
|
||
| flush) | ||
| read -p "This will truncate the DB. Continue? [y/N]" | ||
| if [[ ! $REPLY =~ [Yy] ]]; then | ||
| exit | ||
| fi | ||
| wasrunning=$(stop_jackrabbit) | ||
| rm -rf jackrabbit/repository/datastore | ||
| rm -rf jackrabbit/repository/index | ||
| rm -rf jackrabbit/workspaces/nzz/index | ||
| rm -rf jackrabbit/workspaces/nzz/db | ||
| rm -rf jackrabbit/version | ||
| echo 'Flushed repository and workspace.' | ||
| [ $wasrunning ] && start_jackrabbit | ||
| ;; | ||
|
|
||
| flush:test) | ||
| read -p "This will truncate the test DB. Continue? [y/N]" | ||
| if [[ ! $REPLY =~ [Yy] ]]; then | ||
| exit | ||
| fi | ||
| wasrunning=$(stop_jackrabbit) | ||
| # rm -rf jackrabbit/repository/datastore | ||
| # rm -rf jackrabbit/repository/index | ||
| rm -rf jackrabbit/workspaces/nzz_test/index | ||
| rm -rf jackrabbit/workspaces/nzz_test/db | ||
| rm -rf jackrabbit/version | ||
| echo 'Flushed repository and workspace.' | ||
| [ $wasrunning ] && start_jackrabbit | ||
| ;; | ||
|
|
||
| register) | ||
| app/console doctrine:phpcr:register-system-node-types --allow-update | ||
| app/console doctrine:phpcr:register-node-types ./script/nzz_unstructure.cnd --allow-update | ||
| ;; | ||
| log) | ||
| tail -f jackrabbit/log/jackrabbit.log | ||
| ;; | ||
| stop) | ||
| stop_jackrabbit >/dev/null | ||
| ;; | ||
| restart) | ||
| stop_jackrabbit >/dev/null | ||
| start_jackrabbit | ||
| ;; | ||
| start) | ||
| start_jackrabbit | ||
| ;; | ||
| status) | ||
| status_jackrabbit | ||
| ;; | ||
|
|
||
| *) | ||
| echo "Unknown action: $action" | ||
| usage | ||
| exit 1 | ||
| esac | ||
|
|
||
|
There was a problem hiding this comment. seems like a duplication of https://github.com/sixty-nine/Jackrabbit-startup-script |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| <?php | ||
|
|
||
| namespace Sandbox\MainBundle\Controller; | ||
|
|
||
| use Sandbox\MainBundle\Document\Image; | ||
|
|
||
| use Doctrine\ODM\PHPCR\DocumentManager; | ||
|
|
||
| use FOS\RestBundle\View\ViewHandlerInterface; | ||
| use FOS\RestBundle\View\View; | ||
|
|
||
| use Symfony\Component\HttpFoundation\Response; | ||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; | ||
|
|
||
| use Symfony\Component\DependencyInjection\ContainerInterface; | ||
| use Symfony\Bundle\FrameworkBundle\Controller\Controller; | ||
|
|
||
| class ImageController extends Controller | ||
| { | ||
| protected $dm; | ||
|
|
||
| /** | ||
| * @var FOS\RestBundle\View\ViewHandlerInterface | ||
| */ | ||
| private $viewHandler; | ||
|
|
||
| protected $images_mime = array( | ||
| 'image/png', | ||
| 'image/jpeg', | ||
| 'image/gif', | ||
| 'image/bmp', | ||
| 'image/vnd.microsoft.icon', | ||
| 'image/tiff', | ||
| 'image/svg+xml'); | ||
|
|
||
| public function __construct(ContainerInterface $container, DocumentManager $dm, ViewHandlerInterface $viewHandler) | ||
| { | ||
| $this->container = $container; | ||
| $this->dm = $dm; | ||
| $this->viewHandler = $viewHandler; | ||
| } | ||
|
|
||
| public function displayAction($id) | ||
| { | ||
| $basepath = $this->container->getParameter('symfony_cmf_content.static_basepath'); | ||
|
|
||
| $image = $this->dm->find(null, $basepath.'/'.$id); | ||
|
|
||
| $data = stream_get_contents($image->content); | ||
|
|
||
| $response = new Response($data); | ||
| $response->headers->set('Content-Type', 'image/jpeg'); | ||
| $response->setPublic(); | ||
|
|
||
| $date = new \DateTime(); | ||
| $date->setTimestamp(time() + 332640000); | ||
| $response->setExpires($date); | ||
| $response->setMaxAge(332640000); | ||
|
|
||
| return $response; | ||
| } | ||
|
|
||
| public function uploadAction(Request $request) | ||
| { | ||
| $basepath = $this->container->getParameter('symfony_cmf_content.static_basepath'); | ||
| $error = false; | ||
| $path = ''; | ||
|
|
||
| $files = $request->files; | ||
|
|
||
| $id = ''; | ||
| foreach ($files->all() as $file ) { | ||
| if (in_array($file->getClientMimeType(), $this->images_mime)) { | ||
| $name = $file->getClientOriginalName(); | ||
| $path = $file->getPathname(); | ||
| $id = md5(time()); | ||
| $jcrPath = $basepath.'/'.$id; | ||
| if (!$this->dm->find(null, $jcrPath)) { | ||
| $image = new Image(); | ||
| $image->setPath($jcrPath); | ||
| $image->name = $id; | ||
| $image->content = file_get_contents($path); | ||
| $image->tags = explode(',', $request->get('tags')); | ||
| } else { | ||
| $error = 'This file already exists in your backend.'; | ||
| } | ||
|
|
||
| $this->dm->persist($image); | ||
| } else { | ||
| $error = "What you're trying to upload is not an image."; | ||
| } | ||
| } | ||
|
|
||
| $this->dm->flush(); | ||
|
|
||
| return $this->redirect($this->generateUrl('image_display', array('id' => $id))); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should probably come from the config value of the routing bundle. but thats a viebundle issue, not related to this merge.