改回jpg格式,增加压缩比,增加一些照片

9 files changed, 22 insertions, 11 deletions

diff --git a/KagurazakaYashi/src/README.md b/KagurazakaYashi/src/README.md
index 00faeed..8888118 100644
--- a/KagurazakaYashi/src/README.md
+++ b/KagurazakaYashi/src/README.md
@@ -10,9 +10,11 @@
 
 因为 `Google+` ，因为 `神楽坂雯麗` ，我有了现在的网名。
 
-- 由于之前照片的体积过大（甚至单张超过 20MB ），目前已对这些照片进行了压缩。
-  - 由于采用 webp 格式压缩，建议使用 Chrome 浏览器浏览和打开。
-  - 尺寸缩小为任一边最高 1920 像素。
+- 由于之前照片的体积过大（甚至单张超过 20MB ），目前已对这些照片进行了压缩。图片使用了以下处理参数：
+  - `convert -resize 1920x1920 -quality 80% *.jpg`
+  - `exiftool -gps:all= *.jpg`
+  - `gpg -u *** -o sig/*.sig -ab *`
+  - `creadme.rb`
 
 # Distribution
 
@@ -21,6 +23,8 @@
 - Google+: <https://plus.google.com/105938465531761409080>
 - Facebook: <https://www.facebook.com/580447548816252>
 - Twitter: <http://twitter.com/kagurazakayashi>
+- Mastodon: @yashi@hitorino.moe
+- MeWe: <https://mewe.com/profile/5bc5fe8aa5f4e53ee072543d>
 - Weibo: <https://weibo.com/KagurazakaYashi>
 - BiliBili: <https://space.bilibili.com/870497>
 - Gravatar: <http://cn.gravatar.com/cyshope>
diff --git a/KagurazakaYashi/src/c1920jpg.sh b/KagurazakaYashi/src/c1920jpg.sh
new file mode 100644
index 0000000..94112dd
--- /dev/null
+++ b/KagurazakaYashi/src/c1920jpg.sh
@@ -0,0 +1,2 @@
+# 在原始高清文件夹下运行，压制图片
+for file in *.jpg; do echo $file ${file%%.*}.jpg; convert -resize 1920x1920 -quality 80% $file ../${file%%.*}.jpg; done
\ No newline at end of file
diff --git a/KagurazakaYashi/src/c1920webp.sh b/KagurazakaYashi/src/c1920webp.sh
index 32faab6..1c41a47 100644
--- a/KagurazakaYashi/src/c1920webp.sh
+++ b/KagurazakaYashi/src/c1920webp.sh
@@ -1 +1,2 @@
-for file in *.jpg; do echo $file ${file%%.*}.webp; convert -resize 1920x1920 $file ${file%%.*}.webp; done
\ No newline at end of file
+# 在原始高清文件夹下运行，压制 webp 图片
+for file in *.jpg; do echo $file ${file%%.*}.webp; convert -resize 1920x1920 $file ../${file%%.*}.webp; done
\ No newline at end of file
diff --git a/KagurazakaYashi/src/creadme.rb b/KagurazakaYashi/src/creadme.rb
index 5b88f49..7768949 100644
--- a/KagurazakaYashi/src/creadme.rb
+++ b/KagurazakaYashi/src/creadme.rb
@@ -3,13 +3,13 @@
 # komeiji-satori <- kagurazakayashi
 # by kagurazakayashi
 require 'pathname'
-FILETYPE = ".webp"
-GITHUBURL_D = "https://github.com/komeiji-satori/Dress/tree/master/KagurazakaYashi"
+FILETYPE = ".jpg"
+GITHUBURL_D = "https://github.com/komeiji-satori/Dress/blob/master/KagurazakaYashi/README.md"
 GITHUBURL_MD = "https://github.com/komeiji-satori/Dress/blob/master/KagurazakaYashi/bin/"
 GITHUBURL_IMG = "https://github.com/komeiji-satori/Dress/blob/master/KagurazakaYashi/"
 MDTABLEFORMAT = "| ------: | :------: | :------ | :------: |"
 READMETEMPLATE = "src/README.md"
-RELEASEMDDIR = "bin/"
+RELEASEMDDIR = "md/"
 READMEMD = "README.md"
 newmd = Array.new
 readme = Array.new
@@ -21,7 +21,7 @@ end
 nowpath = Pathname.new(File.dirname(__FILE__)).realpath
 Dir.foreach(nowpath) do |file|
     if file !="." and file !=".."
-        if file[-5,5] == FILETYPE
+        if file[-4,4] == FILETYPE
             imgfilenames << file
         end
     end
@@ -60,7 +60,7 @@ puts nowmdfilename;
 newmdfile = File.new(nowmdfilename,"w")
 newmd << "| 上一张 | 0 / " + imgfilenameslen.to_s + " | [下一张](" + firstlink + ") | 回封面 |"
 newmd << MDTABLEFORMAT
-newmd << "\n![封面](" + GITHUBURL_IMG + "src/" + "title.webp?raw=true)"
+newmd << "\n![封面](" + GITHUBURL_IMG + "src/" + "title.jpg?raw=true)"
 newmd += readme
 for newlinestr in newmd do
     newmdfile.puts newlinestr
diff --git a/KagurazakaYashi/src/csig.bat b/KagurazakaYashi/src/csig.bat
index 3a40641..ba039d0 100644
--- a/KagurazakaYashi/src/csig.bat
+++ b/KagurazakaYashi/src/csig.bat
@@ -1 +1,2 @@
-for /f "delims=" %%a in ('dir /a-d /b^|findstr /v /i  "\.bat"') do (gpg -u 1F017CCB7C3BFE6CEA4F5D5D3127DF05A772B61D -o "%%a".sig -ab "%%a")
\ No newline at end of file
+REM 创建数字签名，在主目录运行
+for /f "delims=" %%a in ('dir /a-d /b^|findstr /v /i  "\.bat"') do (gpg -u 1F017CCB7C3BFE6CEA4F5D5D3127DF05A772B61D -o sig\"%%a".sig -ab "%%a")
\ No newline at end of file
diff --git a/KagurazakaYashi/src/csig.sh b/KagurazakaYashi/src/csig.sh
index 9557996..57e9833 100644
--- a/KagurazakaYashi/src/csig.sh
+++ b/KagurazakaYashi/src/csig.sh
@@ -1 +1,2 @@
-for file in *.webp; do echo $file $file.sig; gpg -u 1F017CCB7C3BFE6CEA4F5D5D3127DF05A772B61D -o $file.sig -ab $file; done
\ No newline at end of file
+# 创建数字签名，在主目录运行
+for file in *.jpg; do echo $file $file.sig; gpg -u 1F017CCB7C3BFE6CEA4F5D5D3127DF05A772B61D -o sig/$file.sig -ab $file; done
\ No newline at end of file
diff --git a/KagurazakaYashi/src/rmgps.sh b/KagurazakaYashi/src/rmgps.sh
new file mode 100644
index 0000000..ab3bf8e
--- /dev/null
+++ b/KagurazakaYashi/src/rmgps.sh
@@ -0,0 +1,2 @@
+# 删除 GPS 数据
+exiftool -gps:all= ../*.jpg
\ No newline at end of file
diff --git a/KagurazakaYashi/src/title.jpg b/KagurazakaYashi/src/title.jpg
new file mode 100644
index 0000000..f8e8b36
--- /dev/null
+++ b/KagurazakaYashi/src/title.jpg
diff --git a/KagurazakaYashi/src/title.webp b/KagurazakaYashi/src/title.webp
deleted file mode 100644
index 74d191f..0000000
--- a/KagurazakaYashi/src/title.webp
+++ /dev/null