Diff 268

swh/web/ui/static/js/filedrop.js

This file was deleted.

This file was completely deleted. Show File Contents

swh/web/ui/static/js/search.js

This file was added.

				/**
				* Search page management
				* Args:
				* textForm: the form containing the text input, if any
				* fileForm: the form containing the file input, if any
				* messageElem: the element that should display search messages
				*/
				var SearchFormController = function(textForm, fileForm, messageElem)

				{
				this.textForm = textForm;
				this.fileForm = fileForm;
				this.messageElem = messageElem;

				// List of hashes to check against files being processed
				this.hashed_already = {
				'sha1': {},
				'sha256': {},
				'sha1_git': {}
				};
				this.algos = ['sha1', 'sha256', 'sha1_git'];
				this.CHECKSUM_RE = /^([0-9a-f]{40}\|[0-9a-f]{64})$/i;
				var self = this;

				/**
				* Show search messages on the page
				* Args:
				* msg: the message to show
				*/
				this.searchMessage = function(msg) {
				self.messageElem.empty();
				self.messageElem.text(msg);
				};

				/**
				* Setup the text field
				* Args:
				* textFormInput: the text form's input
				*/
				this.setupTextForm = function(textFormInput) {
				self.textForm.submit(function(event) {
				var q = textFormInput.val();
				if (!q) {
				event.preventDefault();
				self.searchMessage("Please enter a SHA-1 or SHA-256 checksum.");
				}
				else if (q && !q.match(self.CHECKSUM_RE)) {
				event.preventDefault();
				self.searchMessage("Invalid SHA-1 or SHA-256 checksum");
				}
				});
				};

				/**
				* Setup the file drag&drop UI and hashing support.
				* Args:
				* fileDropElem: the element receptive to drag & drop
				* hashedListerElem: the element that receives the hased file descriptions
				* fileFormInput: the input that actually receives files
				* clearButton: the button used to clear currently hashed files
				*/
				this.setupFileForm = function(fileDropElem, hashedListerElem, fileFormInput, clearButton) {
				if (!FileReader \|\| !CryptoJS) {
				self.searchMessage("Client-side file hashing is not available for your browser.");
				return;
				}

				// Enable clicking on the text element for file picker
				fileDropElem.click(function(event) {
				event.preventDefault();
				fileFormInput.click();
				});

				// Enable drag&drop
				var makeDroppable = function(fileReceptionElt) {
				var fileshovering = false;

				fileReceptionElt.on('dragover', function(event) {
				event.stopPropagation();
				event.preventDefault();
				});

				fileReceptionElt.on('dragenter', function(event) {
				event.stopPropagation();
				event.preventDefault();
				if (!fileshovering) {
				fileReceptionElt.css("border-style", "solid");
				fileReceptionElt.css("box-shadow", "inset 0 3px 4px");
				fileshovering = true;
				}
				});

				fileReceptionElt.on('dragover', function(event) {
				event.stopPropagation();
				event.preventDefault();
				if (!fileshovering) {
				fileReceptionElt.css("border-style", "solid");
				fileReceptionElt.css("box-shadow", "inset 0 3px 4px");
				fileshovering = true;
				}
				});

				fileReceptionElt.on('dragleave', function(event) {
				event.stopPropagation();
				event.preventDefault();
				if (fileshovering) {
				fileReceptionElt.css("border-style", "dashed");
				fileReceptionElt.css("box-shadow", "none");
				fileshovering = false;
				}
				});

				fileReceptionElt.on('drop', function(event) {
				event.stopPropagation();
				event.preventDefault();
				if (fileshovering) {
				fileReceptionElt.css("border-style", "dashed");
				fileReceptionElt.css("box-shadow", "none");
				fileshovering = false;
				}
				var myfiles = event.originalEvent.dataTransfer.files;
				readAndHash(myfiles);
				});
				};
				makeDroppable(fileDropElem);

				// Connect input change and rehash
				var makeInputChange = function(fileInput) {
				return fileInput.each(function() {
				$(this).on('change', function(){
				readAndHash(this.files);
				});
				});
				};
				makeInputChange(fileFormInput);

				// Connect clear button
				var makeClearButton = function(button) {
				return button.each(function() {
				$(this).click(function(event) {
				event.preventDefault();
				hashedListerElem.empty();
				self.fileForm.children('.search-hidden').remove();
				self.hashed_already = {
				'sha1': {},
				'sha256': {},
				'sha1_git': {}
				};
				});
				});
				};
				makeClearButton(clearButton);

				var readAndHash = function(filelist) {
				for (var file_idx = 0; file_idx < filelist.length; file_idx++) {
				var file = filelist.item(file_idx);
				var fr = new FileReader();
				bindReader(fr, file.name);
				fr.readAsArrayBuffer(file);
				}
				};

				var bindReader = function(freader, fname) {
				freader.onloadend = function(event) {
				if (event.target.readyState == FileReader.DONE)
				return dedupAndAdd(event.target.result, fname);
				else
				return null;
				};
				};

				/**
				* Hash the buffer with SHA-1, SHA-1_GIT, SHA-256
				* Args:
				* buffer: the buffer to hash
				* fname: the file name corresponding to the buffer
				* Returns:
				* a dict of algo_hash: hash
				*/
				var hashBuffer = function (buffer, fname) {
				function str2ab(header) {
				var buf = new ArrayBuffer(header.length);
				var view = new Uint8Array(buf); // byte view, all we need is ASCII
				for (var idx = 0, len=header.length; idx < len; idx++)
				view[idx] = header.charCodeAt(idx);
				return buf;
				}

				var content_array = CryptoJS.lib.WordArray.create(buffer);
				var git_hd_str = 'blob ' + buffer.byteLength + '\0';
				var git_hd_buffer = str2ab(git_hd_str);
				var git_hd_array = CryptoJS.lib.WordArray.create(git_hd_buffer);

				var sha1 = CryptoJS.SHA1(content_array);
				var sha256 = CryptoJS.SHA256(content_array);
				var sha1_git = CryptoJS.SHA1(git_hd_array.concat(content_array));
				return {
				'sha1': sha1 + '',
				'sha256': sha256 + '',
				'sha1_git': sha1_git + ''
				};
				};

				/**
				* Hash the buffer and add it to the form if it is unique
				* If not, display which file has the same content
				* Args:
				* buffer: the buffer to hash
				* fname: the file name corresponding to the buffer
				*/
				var dedupAndAdd = function(buffer, fname) {
				var hashes = hashBuffer(buffer);
				var has_duplicate = false;
				for (var algo_s in hashes) {
				if (self.hashed_already[algo_s][hashes[algo_s]] != undefined) {
				// Duplicate content -- fileLister addition only, as duplicate
				hashedListerElem.append($('<div>')
				.addClass('span3')
				.text(fname + ': duplicate of ' + self.hashed_already[algo_s][hashes[algo_s]]));
				has_duplicate = true;
				break;
				}
				}
				// First file read with this content -- fileLister and form addition
				if (!has_duplicate) {
				// Add to hashed list
				for (var algo_c in self.hashed_already)
				self.hashed_already[algo_c][hashes[algo_c]] = fname;
				hashedListerElem.append($('<div>')
				.addClass('span3')
				.text(fname));
				var hashstring = JSON.stringify(hashes).replace('\"', '\'');
				self.fileForm.append($("<input>", {type: 'hidden',
				class: 'search-hidden',
				name: fname,
				value: hashes['sha1']}// hashstring}
				));

				}
				};
				};
				};

View Options

swh/web/ui/static/lib/jquery.js

This file was deleted.

Property	Old Value	New Value
File Mode	120000	null

This file was completely deleted. Show File Contents

View Options

swh/web/ui/templates/search.html

	{% extends "layout.html" %}			{% extends "layout.html" %}
	{% block title %}Search SWH{% endblock %}			{% block title %}Search SWH{% endblock %}
	{% block content %}			{% block content %}

	<!-- CryptoJS assumed to be installed as a debian package -->
	<script src="{{ url_for('static', filename='lib/core.js') }}"></script>			<script src="{{ url_for('static', filename='lib/core.js') }}"></script>
	<script src="{{ url_for('static', filename='lib/lib-typedarrays.js') }}"></script>			<script src="{{ url_for('static', filename='lib/lib-typedarrays.js') }}"></script>
	<script src="{{ url_for('static', filename='lib/sha1.js') }}"></script>			<script src="{{ url_for('static', filename='lib/sha1.js') }}"></script>
	<script src="{{ url_for('static', filename='lib/sha256.js') }}"></script>			<script src="{{ url_for('static', filename='lib/sha256.js') }}"></script>
	<script src="{{ url_for('static', filename='js/filedrop.js') }}"></script>			<script src="{{ url_for('static', filename='js/search.js') }}"></script>

	<div class="container">			<div class="container">
	<form id="searchForm"			<!-- The text-based SHA1 or SHA256 search -->
				<h1 class="label label-default">Search with SHA-1 or SHA-256:</h1>
				<form id="text-hash-form"
	action="{{ url_for('search') }}"			action="{{ url_for('search') }}"
	class="form"			class="form"
	method="post"			method="get">
	enctype="multipart/form-data">
	<div class="form-group">
	<label for="sha1_textinput">Search with SHA-1 or SHA-256:</label>
	<br/>			<br/>
	<div id="textinput" class="input-group">			<div class="input-group">
	<input id="sha1_textinput"			<input id="text-hash-input"
	type="text" class="form-control"			type="text" class="form-control"
	name="q"			name="q"
	placeholder="SHA-1 or SHA-256 checksum" />			placeholder="SHA-1 or SHA-256 checksum" />
	</div>			<span class="input-group-btn">
	</div>			<button id="text-hash-submit"
	<div id="filesinput" class="input-group">			class="btn btn-primary"
	<label for="fileElem">Search with files</label>			type="submit">
	<div id="fileinput" class="container text-center" style="border: 1px dashed black">			Text search
	Drag and drop or click here to hash files and search for them.
	Your files will NOT be uploaded, hashing is done locally.
	Filesizes over 20Mb may be slow to process, use with care.
	<div id="filelist" class="row">
	</div>
	</div>
	</div>
	<div class="text-center" style="margin-top: 10px">
	<button id="submitall" type="submit" class="btn btn-primary">
	<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
	Search
	</button>			</button>
				</span>
	</div>			</div>
	</form>			</form>

				<!-- The file-based drag&drop UI-->
				<h1 class="label label-default">Search with files</h1>
				<form id="file-hash-form"
				action="{{ url_for('search') }}"
				class="text-center form"
				method="post"
				enctype="multipart/form-data">

				<!--Form input -->
	<input type="file"			<input type="file"
	id="fileElem"			id="file-hash-input"
	class="form-control"			class="form-control"
	multiple			multiple
	name="filename"			name="filename"
	value=""			value=""
	style="display:none"			style="display:none"
	placeholder="File(s) to upload, hash and search for SHA-1 or SHA-256 checksum" />			placeholder="File(s) to hash and search" />
	<div id="swh-search-message" class="message">			<div id="file-drop" class="container text-center" style="border: 1px dashed black">
				Drag and drop or click here to hash files and search for them.
				Your files will NOT be uploaded, hashing is done locally.
				Filesizes over 20Mb may be slow to process, use with care.
				<div id="filelist" class="row"></div>
				</div>

				<!-- Form buttons -->
				<div class="btn-group" style="margin-top: 10px">
				<button id="file-hash-submission" type="submit" class="btn btn-primary">
				<span class="glyphicon glyphicon-search" type="submit" aria-hidden="true"></span>
				Search
				</button>
				<button id="file-hash-clear" class="btn btn-primary">
				Clear
				<span class="glyphicon glyphicon-erase" aria-hidden="true"></span>
				</button>
	</div>			</div>
				</form>

				<div id="search-message" class="message"></div>

				<!-- Search forms setup -->
				<script>
				var sfc = new SearchFormController($('#text-hash-form'), $('#file-hash-form'), $('#search-message'));
				sfc.setupTextForm($('#text-hash-input'));
				sfc.setupFileForm($('#file-drop'),$('#filelist'),$('#file-hash-input'),$('#file-hash-clear'));
				</script>

	{% if search_res is not none %}			{% if search_res is not none %}
				<!-- Search result display -->
	{% if search_stats is not none %}			{% if search_stats is not none %}
	<label id="stats">			<label class="search-stats">
	Files available in SWH: {{ '%.2f' \| format(search_stats['pct']) }}% of			Files available in SWH: {{ '%.2f' \| format(search_stats['pct']) }}% of
	{{ search_stats['nbfiles'] }} files.			{{ search_stats['nbfiles'] }} files.
	</label>			</label>
	{% endif %}			{% endif %}
	<table id="results" class="table table-striped">			<table class="table table-striped search-res">
	<thead class="thead-default">			<thead class="thead-default">
	<th>File name</th>			<th>File name</th>
	<th>SHA1 checksum</th>			<th>SHA256 checksum</th>
	<th>Result</th>			<th>Result</th>
	</thead>			</thead>
	{% for res in search_res %}			{% for res in search_res %}
	<tr>			<tr>
	{% if res['filename'] is not none %}			{% if res['filename'] is not none %}
	<td>{{ res['filename'] }}</td>			<td>{{ res['filename'] }}</td>
	{% else %}			{% else %}
	<td>From text input</td>			<td>From text input</td>
	{% endif %}			{% endif %}
	{% if res['found'] %}			{% if res['found'] %}
	<td><a href="{{ url_for('browse_content') }}sha1:{{ res['sha1'] }}">{{ res['sha1'] }}</a></td>			<td><a href="{{ url_for('browse_content') }}sha1:{{ res['sha1'] }}">{{ res['sha1'] }}</a></td>
	<td><span class="glyphicon glyphicon-ok file-found"></span></td>			<td><span class="glyphicon glyphicon-ok file-found"></span></td>
	{% else %}			{% else %}
	<td>{{ res['sha1'] }}</td>			<td>{{ res['sha1'] }}</td>
	<td><span class="glyphicon glyphicon-remove file-notfound"></span></td>			<td><span class="glyphicon glyphicon-remove file-notfound"></span></td>
	{% endif %}			{% endif %}
	</tr>			</tr>
	{% endfor %}			{% endfor %}
	</table>			</table>
	{% endif %}			{% endif %}
	{% if message is not none %}			{% if message is not none and message != '' %}
	<div class="span8">{{ message \| safe }}</div>			<div class="span8">{{ message \| safe }}</div>
	</div>			</div>
	{% endif %}			{% endif %}
	<!-- jQuery setup -->
	<div id="test"></div>
	<script>
	var form = $('#searchForm');
	var filelist = $('#filelist');
	// Delegate dropbox click
	$('#fileinput').inputclick($('#fileElem'));
	// Make the dropbox available for drag & drop
	$('#fileElem').filedialog(filelist, form);
	// Make the submission button receptive to files
	$('#fileinput').filedrop(filelist, form);
	// Check the text input before submission
	form.checkSubmission($('#sha1_textinput'), $('#swh-search-message'));
	</script>
	</div>			</div>
	{% endblock %}			{% endblock %}

search: refactor and use sha1_git, sha256
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 268

swh/web/ui/static/js/filedrop.js

swh/web/ui/static/js/search.js

swh/web/ui/static/lib/jquery.js

swh/web/ui/templates/search.html

search: refactor and use sha1_git, sha256ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 268

swh/web/ui/static/js/filedrop.js

swh/web/ui/static/js/search.js

swh/web/ui/static/lib/jquery.js

swh/web/ui/templates/search.html

search: refactor and use sha1_git, sha256
ClosedPublic
Actions

Revision Contents
Changeset List