Skip to content

Commit

Permalink
Merge branch 'master' into explorer-improvements
Browse files Browse the repository at this point in the history
# Conflicts:
#	VERSION
#	datasources/telegram/search_telegram.py
#	datasources/twitter-import/search_twitter.py
#	processors/filtering/write_annotations.py
#	setup.py
  • Loading branch information
sal-uva committed Aug 26, 2024
2 parents c878708 + e276033 commit 1c4b905
Show file tree
Hide file tree
Showing 115 changed files with 1,915 additions and 22,831 deletions.
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MPL-2.0",
"title": "4CAT Capture and Analysis Toolkit",
"upload_type": "software",
"version": "v1.44",
"version": "v1.45",
"keywords": [
"webmining",
"scraping",
Expand Down
36 changes: 35 additions & 1 deletion LICENSE-3DPARTY
Original file line number Diff line number Diff line change
Expand Up @@ -802,4 +802,38 @@ Incorporates the Graphology graph manipulation library
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.

-------------------------------------------------------------------------------
Incorporates the zip.js library
- at /webtool/static/js/zip.min.js
- from https://github.com/gildas-lormeau/zip.js

BSD 3-Clause License

Copyright (c) 2023, Gildas Lormeau

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion backend/lib/processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ def extract_archived_file_by_name(self, filename, archive_path, staging_area=Non

with zipfile.ZipFile(archive_path, "r") as archive_file:
if filename not in archive_file.namelist():
raise KeyError("File %s not found in archive %s" % (filename, archive_path))
raise FileNotFoundError("File %s not found in archive %s" % (filename, archive_path))
else:
archive_file.extract(filename, staging_area)
return staging_area.joinpath(filename)
Expand Down
1 change: 1 addition & 0 deletions common/assets/stopwords-iso.json

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions common/assets/stopwords-languages.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{"af": "Afrikaans",
"ar": "Arabic",
"hy": "Armenian",
"eu": "Basque",
"bn": "Bengali",
"br": "Breton",
"bg": "Bulgarian",
"ca": "Catalan; Valencian",
"cs": "Czech",
"zh": "Chinese",
"da": "Danish",
"de": "German",
"nl": "Dutch",
"el": "Greek (Modern)",
"en": "English",
"eo": "Esperanto",
"et": "Estonian",
"fa": "Persian",
"fi": "Finnish",
"fr": "French",
"ga": "Irish",
"gl": "Galician",
"gu": "Gujarati",
"ha": "Hausa",
"he": "Hebrew",
"hi": "Hindi",
"hr": "Croatian",
"hu": "Hungarian",
"id": "Indonesian",
"it": "Italian",
"ja": "Japanese",
"ko": "Korean",
"ku": "Kurdish",
"la": "Latin",
"lv": "Latvian",
"lt": "Lithuanian",
"mr": "Marathi",
"ms": "Malay",
"no": "Norwegian",
"pl": "Polish",
"pt": "Portuguese",
"ro": "Romanian; Moldavian; Moldovan",
"ru": "Russian",
"sk": "Slovak",
"sl": "Slovenian",
"so": "Somali",
"st": "Sotho, Southern",
"es": "Spanish; Castilian",
"sw": "Swahili",
"sv": "Swedish",
"tl": "Tagalog",
"th": "Thai",
"tr": "Turkish",
"uk": "Ukrainian",
"ur": "Urdu",
"vi": "Vietnamese",
"yo": "Yoruba",
"zu": "Zulu"}
Loading

0 comments on commit 1c4b905

Please sign in to comment.