boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

*) solving unpacking problems with to long filename by

Browse Source 
a) renaming the parent folder in the tgz file to yacy
      (can be configured via build properties file)
   b) reconfiguring build file to throw an error if a file
      name is too long 
Please note that currently there is _no_ proplem with too long
class names because of step a.

      

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2207 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
theli 19 years ago
parent fb090652df
commit 45b39ee1be
16 changed files with 60 additions and 65 deletions
Show Stats Download Patch File Download Diff File

1
build.properties
Unescape View File

@ -8,6 +8,7 @@ releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
#releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz #releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr} releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}
#releaseDir=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr} #releaseDir=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}
releaseFileParentDir=yacy
releaseNr=$Revision$ releaseNr=$Revision$
# defining some file/directory access rights # defining some file/directory access rights

14
build.xml
Unescape View File

@ -514,14 +514,14 @@
======================================================================================================= --> ======================================================================================================= -->
<target name="distMain" depends="copyMain4Dist" description="Compiling sources and make a release file ..."> <target name="distMain" depends="copyMain4Dist" description="Compiling sources and make a release file ...">
<tar destfile="${release}/${releaseFile}" compression="gzip" defaultexcludes="yes" longfile="gnu"> <tar destfile="${release}/${releaseFile}" compression="gzip" defaultexcludes="yes" longfile="fail">
<!-- packing all files into a gzipped tar --> <!-- packing all files into a gzipped tar -->
<tarfileset dir="${release_main}" prefix="${releaseDir}/" dirmode="${accessRightsDir}" mode="${accessRightsExecutable}"> <tarfileset dir="${release_main}" prefix="${releaseFileParentDir}/" dirmode="${accessRightsDir}" mode="${accessRightsExecutable}">
<include name="**/*.sh"/> <include name="**/*.sh"/>
<include name="**/*.command"/> <include name="**/*.command"/>
</tarfileset> </tarfileset>
<tarfileset dir="${release_main}" prefix="${releaseDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" > <tarfileset dir="${release_main}" prefix="${releaseFileParentDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" >
<include name="**/*.*"/> <include name="**/*.*"/>
<exclude name="**/*.sh"/> <exclude name="**/*.sh"/>
<exclude name="**/*.command"/> <exclude name="**/*.command"/>
@ -536,20 +536,20 @@
</target> </target>
<target name="distAllInOne" depends="copyMain4Dist,compileExtensions"> <target name="distAllInOne" depends="copyMain4Dist,compileExtensions">
<tar destfile="${release}/${allInOneFile}" compression="gzip" defaultexcludes="yes" longfile="gnu"> <tar destfile="${release}/${allInOneFile}" compression="gzip" defaultexcludes="yes" longfile="fail">
<!-- packing all files into a gzipped tar --> <!-- packing all files into a gzipped tar -->
<tarfileset dir="${release_main}" prefix="${releaseDir}/" dirmode="${accessRightsDir}" mode="${accessRightsExecutable}"> <tarfileset dir="${release_main}" prefix="${releaseFileParentDir}/" dirmode="${accessRightsDir}" mode="${accessRightsExecutable}">
<include name="**/*.sh"/> <include name="**/*.sh"/>
<include name="**/*.command"/> <include name="**/*.command"/>
</tarfileset> </tarfileset>
<tarfileset dir="${release_main}" prefix="${releaseDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" > <tarfileset dir="${release_main}" prefix="${releaseFileParentDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" >
<include name="**/*.*"/> <include name="**/*.*"/>
<exclude name="**/*.sh"/> <exclude name="**/*.sh"/>
<exclude name="**/*.command"/> <exclude name="**/*.command"/>
</tarfileset> </tarfileset>
<tarfileset dir="${release_ext}" prefix="${releaseDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" > <tarfileset dir="${release_ext}" prefix="${releaseFileParentDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" >
<include name="**/*.*"/> <include name="**/*.*"/>
</tarfileset> </tarfileset>
</tar> </tar>

7
doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt
Unescape View File

@ -1,7 +0,0 @@
// Testing if the yacy archive file were unzipped correctly.
// This test is needed because of classfile-names longer than 100 chars
// which could cause problems with incompatible unzip software.
// See:
// - http://www.yacy-forum.de/viewtopic.php?t=1763
// - http://www.yacy-forum.de/viewtopic.php?t=715
// - http://www.yacy-forum.de/viewtopic.php?t=1674

6
source/de/anomic/plasma/parser/bzip/build.xml
Unescape View File

@ -24,13 +24,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="bzip2.jar" includes="bzip2.jar"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/doc/build.xml
Unescape View File

@ -26,13 +26,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="tm-extractors-0.4.*" includes="tm-extractors-0.4.*"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

4
source/de/anomic/plasma/parser/gzip/build.xml
Unescape View File

@ -22,10 +22,10 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/mimeType/build.xml
Unescape View File

@ -29,13 +29,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="jmimemagic-0.0.4a.jar,jakarta-oro-2.0.7.jar,log4j-1.2.9.jar,xerces.jar" includes="jmimemagic-0.0.4a.jar,jakarta-oro-2.0.7.jar,log4j-1.2.9.jar,xerces.jar"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/odt/build.xml
Unescape View File

@ -24,13 +24,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="odf_utils_05_11_10.*" includes="odf_utils_05_11_10.*"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/pdf/build.xml
Unescape View File

@ -26,13 +26,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="PDFBox-0.7.2.*" includes="PDFBox-0.7.2.*"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/rpm/build.xml
Unescape View File

@ -25,13 +25,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="jrpm-head.*,log4j-1.2.9.jar" includes="jrpm-head.*,log4j-1.2.9.jar"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/rss/build.xml
Unescape View File

@ -31,13 +31,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="informa-0.6.0.*,commons-logging.jar,jdom.jar" includes="informa-0.6.0.*,commons-logging.jar,jdom.jar"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

4
source/de/anomic/plasma/parser/rtf/build.xml
Unescape View File

@ -22,10 +22,10 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/tar/build.xml
Unescape View File

@ -25,13 +25,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="tar.jar" includes="tar.jar"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

6
source/de/anomic/plasma/parser/vcf/build.xml
Unescape View File

@ -24,13 +24,13 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${libx}"
includes="commons-codec-1.3.*" includes="commons-codec-1.3.*"
prefix="${releaseDir}/libx/" prefix="${releaseFileParentDir}/libx/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

4
source/de/anomic/plasma/parser/zip/build.xml
Unescape View File

@ -22,10 +22,10 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseDir}/classes/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
</tar> </tar>
</target> </target>

37
source/yacy.java
Unescape View File

@ -229,24 +229,25 @@ public final class yacy {
final File dataFolder = new File(homePath, "DATA"); final File dataFolder = new File(homePath, "DATA");
if (!(dataFolder.exists())) dataFolder.mkdir(); if (!(dataFolder.exists())) dataFolder.mkdir();
// Testing if the yacy archive file were unzipped correctly. /*
// This test is needed because of classfile-names longer than 100 chars // Testing if the yacy archive file were unzipped correctly.
// which could cause problems with incompatible unzip software. // This test is needed because of classfile-names longer than 100 chars
// See: // which could cause problems with incompatible unzip software.
// - http://www.yacy-forum.de/viewtopic.php?t=1763 // See:
// - http://www.yacy-forum.de/viewtopic.php?t=715 // - http://www.yacy-forum.de/viewtopic.php?t=1763
// - http://www.yacy-forum.de/viewtopic.php?t=1674 // - http://www.yacy-forum.de/viewtopic.php?t=715
File unzipTest = new File(homePath,"doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt"); // - http://www.yacy-forum.de/viewtopic.php?t=1674
if (!unzipTest.exists()) { File unzipTest = new File(homePath,"doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt");
String errorMsg = "The archive file containing YaCy was not unpacked correctly. " + if (!unzipTest.exists()) {
"Please use 'GNU-Tar' or upgrade to a newer version of your unzip software.\n" + String errorMsg = "The archive file containing YaCy was not unpacked correctly. " +
"For detailed information on this bug see: " + "Please use 'GNU-Tar' or upgrade to a newer version of your unzip software.\n" +
"http://www.yacy-forum.de/viewtopic.php?t=715"; "For detailed information on this bug see: " +
System.err.println(errorMsg); "http://www.yacy-forum.de/viewtopic.php?t=715";
serverLog.logSevere("STARTUP", errorMsg); System.err.println(errorMsg);
System.exit(1); serverLog.logSevere("STARTUP", errorMsg);
} System.exit(1);
}
*/
final plasmaSwitchboard sb = new plasmaSwitchboard(homePath, "yacy.init", "DATA/SETTINGS/httpProxy.conf"); final plasmaSwitchboard sb = new plasmaSwitchboard(homePath, "yacy.init", "DATA/SETTINGS/httpProxy.conf");

Write Preview
Loading…
Cancel
Save