mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 15:21:55 +00:00
146 lines
9.1 KiB
HTML
146 lines
9.1 KiB
HTML
<html>
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
<title>CUCC Expedition Handbook: Uploading files/photos</title>
|
|
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
|
|
</head>
|
|
<body>
|
|
<h2 id="tophead">CUCC Expedition Handbook</h2>
|
|
<h1>Uploading Photos (complex) </h1>
|
|
|
|
<h3>Simple upload</h3>
|
|
<p>If your needs are simple, then use the <a href="upload-simple.html">simple online form</a> procedure.
|
|
|
|
<h2>The end-result you are trying to achieve</h2>
|
|
What you are trying to do is to get your happy holiday snaps appear <i>properly indexed</i> with all the others from the previous decades of expo history. You can see them all here: <br /> <a
|
|
href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a><br />
|
|
which is the end result. But all you have to do is to upload the photos to the right place.
|
|
A hidden script does the hard work to make it all look nice after the upload.
|
|
|
|
<p>If you are a beginner you can use the initial simple method below (see above)
|
|
for the photos you have taken of cave entrances for cave survey and prospecting purposes.
|
|
|
|
<p>If you are looking for how to upload a GPS track, those instructions have <a href="gpxupload.html">been moved to here</a>.
|
|
|
|
<h3>Names for your photo files and folders</h3>
|
|
<p> Please read the instructions for your folder name and the filenames of the photos in the
|
|
<a href="upload-simple.html">simple online form</a> procedure.
|
|
|
|
<p>Please don't upload lots of near-duplicate photos: cull them first to just the good ones. We don't want any that are out of focus either.
|
|
|
|
|
|
<h2 id="blog">Using uploaded photos in blogs</h2>
|
|
<p>The <a href="https://ukcaving.com/board/index.php?topic=25195.msg310908#msg310908">UK Caving blog</a> requires that
|
|
photos in it are actually hosted elsewhere. This needs to be a permanent place so
|
|
that the blogs can be read in years to come. Imgur, Flikr or Instagram are OK though not ideal (expo has its own Instagram account) but
|
|
your personal GoogleDocs or GooglePhotos stash definitely is not.
|
|
Preferably
|
|
they should be put on the expo server e.g. 2018 blog photos are permanently archived on <a href="http://expo.survex.com/expofiles/photos/2018/BlogPostPhotos/">expo.survex.com<b>/expofiles/</b>photos/2018/BlogPostPhotos/</a> in the published resolution.
|
|
|
|
|
|
<h2 id="experienced">Experienced users</h2>
|
|
<p>OK the admin/nerd you have been asking to move the files to the right place on the <i>expo laptop</i> is getting fed up and now wants you to put the uploaded photos in the right place yourself and not just in /uploads/. This is where they go:
|
|
|
|
<pre>
|
|
directory: /home/expo/expofiles/<b>photos</b>/2019/YourName/
|
|
</pre>
|
|
or, for GPS logs (GPX files):
|
|
<pre>
|
|
directory: /home/expo/expofiles/<b>gpslogs</b>/2019/YourName/
|
|
</pre>
|
|
<p>Obviously replace /2019/ with the current year. This is the expo year the photos are taken, so if you are uploading a previous years' photos which you never got around to uploading you will use /2018/ or whatever.
|
|
<p>Obviously replace 'YourName' with your actual name (no spaces!).
|
|
It is important that you get this right as this specific way of writing
|
|
your name is standardised across the website
|
|
(this is known as "<a href="https://en.wikipedia.org/wiki/Camel_case">CamelCase</a>").
|
|
<p style="margin-left:20px">This is the only place in the whole system
|
|
that you should use some capital letters. Absolutely everywhere else you should use
|
|
only lower-case letters, no spaces, and hyphens (not underlines) when creating filenames, folder names or variable names of any sort.
|
|
<p>
|
|
Use the year that the photo was taken or the GPS track logged.</p>
|
|
|
|
|
|
<h3 id="init">Uploading files from the <i>expo laptop</i></h3>
|
|
<p>Always learn how to <i>use</i> the system first on the <i>expo laptop</i> before trying to do it with your own machine.
|
|
<p>OK the files have been put into the correct place on the laptop by an experienced user and now you need to copy them to the
|
|
server. Don't worry about deleting them from the <i>expo laptop</i> after copying as we can do that clean-up at the end of expo. In
|
|
fact <i>don't</i> delete them from /uploads/ on the <i>expo laptop</i>, moved them to a sub-folder called "already_uploaded" or somesuch in the same folder
|
|
|
|
<p>The expo server has a big section under 'home/expo/expofiles/' that is <b>not under version control</b>. This is dangerous as
|
|
there is no backup. If you overwrite some important files with holiday snaps then we are in big trouble.
|
|
|
|
<p>This is where we store big files that we don't want to keep multiple versions of which is why it is not under verson control.
|
|
|
|
<p>This is why we do not want beginners directly uploading photos to the server but to just put them on the <i>expo laptop</i> instead.
|
|
|
|
<p>So assuming that you have the photos on the laptop in directory:
|
|
<pre>
|
|
/home/expo/expofiles/photos/2019/YourName/
|
|
</pre>
|
|
you are going to be copying them to directory:
|
|
<pre>
|
|
/home/expo/expofiles/photos/2019/YourName/
|
|
</pre>
|
|
on the server.<img src="https://wiki.filezilla-project.org/favicon.ico" width=64 margin =10 align=right>
|
|
|
|
<p>
|
|
|
|
<ul>
|
|
<li>Start up Filezilla - click on red "Fz" logo in the application favourites bar on the laptop desktop.
|
|
<li>Click on the "Bookmarks" menu item:
|
|
<ul>
|
|
<li>At the bottom of the "Bookmarks" drop-down menu you may see "expo-uploads";
|
|
if so, click on it.
|
|
<li>If you can't see "expo-uploads" in that menu
|
|
(because this is temporarily broken in version 3.28 of Filezilla),
|
|
click on the "File" menu item and select "Site Manager...".
|
|
This will display a tree-structured menu in a sub-window and one of the items will be "expo-uploads". Highlight it
|
|
and then click on the "Connect" button at the bottom of the sub-window.
|
|
</ul>
|
|
|
|
<li>If this is the first time it is used this expo you will now be prompted for the password for the expo server. This is the "cavey:beery" one which we never write down or write in emails. Get it verbally or by phone or secure text message from another expoer.
|
|
</ul>
|
|
<p>Now you are in and can copy and move files anywhere. But please stick to copying files from your machine (the left window) to the server (the right window) into the /uploads/, /photos/ or /gpslogs/ folders only:<br><br>
|
|
|
|
<a href="fzexample.png" border=2><img src="fzexample.png" align=center width=65%></a><br>(Click to enlarge).
|
|
|
|
<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">For installing and pre-configuring Filezilla on a new machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically. But <em>none of this will work</em> on new machine until you have also done the <a href="keyexchange.html">key-pair setup</a> procedure.
|
|
|
|
<h3>Automated magic</h3>
|
|
<p>Note that uploading photos does not automatically update the view
|
|
at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> immediately. An update script needs to be run which uses the package 'bins', see <a href="../troggle/serverconfig.html">server config</a>. <p>The photo update script
|
|
<em>should</em> run automatically once/day around midnight UTC (2017 and earlier) or a couple of minutes after you do the upload to the right
|
|
place (2023 maybe.. if Wookey gets this sorted out in time) but may be broken. Prod Wookey to make this happen.</p>
|
|
|
|
|
|
<h2>Expert instructions</h2>
|
|
<p>These have been moved to a separate page: <a href="upload-expert.html">expert upload instructions</a>.
|
|
|
|
|
|
<h2 id="morecomplex">Using your own laptop</h2>
|
|
|
|
<p>To use your own laptop on expo, or after you return from expo, it needs to be an <a href="bulkupdatelaptop.html">expo Bulk data laptop</a>, which takes quite a lot of effort to set up.
|
|
You need need to use FTP. So become an <a href="#experienced">experienced user</a> first.
|
|
|
|
<p>You will need to know the expo password but <em>none of this will work</em> until you have also done the <a href="keyexchange.html">key-pair setup</a> procedure and configured your Bulk Data laptop</p>
|
|
|
|
|
|
<h2 id="android">Getting photo files from phones</h2>
|
|
<p>Phones are set up these days to share photos via apps such as "Gallery" or "Google Photos" and most people never see the photo
|
|
files explicitly. However you will need to see them in order to upload them.
|
|
|
|
<p>When plugged into a computer using a USB cable most laptops will offer the option to copy files as well as charge the phone. If
|
|
your phone does this, then answer "yes" when that popup appears. The photos (and probably all your other media) will be copied to
|
|
the laptop. Where it copies the files depends on your phone and you will have to sit at the laptop to find the folder it has put
|
|
them into. (Note that some cheap USB cables are "power only" and won't do this with any phone.)
|
|
|
|
<p>If you use Google Photos or a similar app you can create an online album using the app and share it with your friends. Do this
|
|
for your caving holiday snaps and cave entrance location photos and share them with an expo nerd who will download them the right
|
|
place on the server. Be careful that you are sharing the full original resolution of the photos and not some cut-down compressed
|
|
bastardized "enhanced" version of the photos.
|
|
|
|
<p>See the <a href="phone.html">Bulk Data phone</a> page for how to do bulk data transfer directly from your phone.
|
|
|
|
<hr /></body>
|
|
</html>
|