From ba9911c14111f23aabf946cd3d5d9798d555b98a Mon Sep 17 00:00:00 2001 From: "Hiroshi.tao" Date: Sat, 15 May 2021 20:34:01 +0800 Subject: [PATCH] dump release 0.5.2 - change LICENSE from BSD-3-Clause to Apache-2 - update dockerfile - cli option support picbed and sapic --- .gitignore | 4 +- Dockerfile | 16 ++-- LICENSE | 231 ++++++++++++++++++++++++++++++++++++++++++++++------- Makefile | 6 +- main.go | 83 +++++++++++-------- 5 files changed, 269 insertions(+), 71 deletions(-) diff --git a/.gitignore b/.gitignore index f0d4412..fc3b8f2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,6 @@ sapicli.*.tar.gz sapicli.*.zip -sapicli.*-amd64 \ No newline at end of file +sapicli.*-amd64 +sapicli +bin/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4352d75..ce79628 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,25 @@ # -- build dependencies with alpine -- -FROM golang:alpine AS builder +FROM golang:1.16.3-alpine3.13 AS builder -ENV GO111MODULE=on \ - CGO_ENABLED=0 \ - GOOS=linux \ - GOARCH=amd64 +LABEL maintainer=me@tcw.im WORKDIR /build COPY . . -RUN go env -w GOPROXY=https://goproxy.cn,direct && \ - go build -ldflags "-s -w -X main.built=$(date -u '+%Y-%m-%dT%H:%M:%SZ')" -o sapicli . +ARG goproxy=https://goproxy.cn + +RUN go env -w GOPROXY=${goproxy},direct + +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.built=$(date -u '+%Y-%m-%dT%H:%M:%SZ')" -o sapicli . # run application with a small image FROM scratch COPY --from=builder /build/sapicli /bin/ +COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ + CMD ["-i"] ENTRYPOINT ["sapicli"] diff --git a/LICENSE b/LICENSE index c3931ae..57bc88a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,29 +1,202 @@ -BSD 3-Clause License - -Copyright (c) 2020, Hiroshi.tao -All rights reserved. - -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. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/Makefile b/Makefile index fec8183..fa36ef5 100644 --- a/Makefile +++ b/Makefile @@ -28,12 +28,14 @@ build-macos: build-windows: CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build ${LDFLAGS} -o $(WIN) && chmod +x $(WIN) -build: clean gotool build-linux build-macos build-windows +build: + go build ${LDFLAGS} -o ./bin/sapicli -release: gotool build +release: gotool build-linux build-macos build-windows mv $(LINUX) $(BINARY) && tar zcvf $(BINARY).$(VERSION)-linux-amd64.tar.gz $(BINARY) && rm $(BINARY) mv $(MACOS) $(BINARY) && tar zcvf $(BINARY).$(VERSION)-darwin-amd64.tar.gz $(BINARY) && rm $(BINARY) mv $(WIN) $(BINARY).exe && zip $(BINARY).$(VERSION)-windows-amd64.zip $(BINARY).exe && rm $(BINARY).exe + clean clean: find . -name '*.tar.gz' -exec rm -f {} + diff --git a/main.go b/main.go index b8e18fc..97b2d0f 100644 --- a/main.go +++ b/main.go @@ -1,3 +1,19 @@ +/* + Copyright 2021 Hiroshi.tao + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + package main import ( @@ -18,7 +34,7 @@ import ( "time" ) -const version = "0.5.1" +const version = "0.5.2" var ( h bool @@ -36,10 +52,10 @@ var ( wg sync.WaitGroup // apiVersion: minimum compatible api interface version - apiVersion string = "1.6.0" + apiVersion string = "1.12.0" goVersion string = strings.TrimLeft(runtime.Version(), "go") - commitID string // git commit id when building - built string // UTC time when building + commitID string = "N/A" // git commit id when building + built string = "N/A" // UTC time when building ) type apiResult struct { @@ -53,6 +69,8 @@ type apiResult struct { } func init() { + log.SetFlags(log.LstdFlags) + flag.BoolVar(&h, "h", false, "show help") flag.BoolVar(&h, "help", false, "show help") @@ -64,9 +82,11 @@ func init() { flag.StringVar(&url, "u", "", "") flag.StringVar(&url, "picbed-url", "", "") + flag.StringVar(&url, "sapic-url", "", "") flag.StringVar(&token, "t", "", "") flag.StringVar(&token, "picbed-token", "", "") + flag.StringVar(&token, "sapic-token", "", "") flag.StringVar(&album, "a", "", "") flag.StringVar(&album, "album", "", "") @@ -95,14 +115,10 @@ func main() { } else if info { fmt.Printf("Cli version: %s\n", version) fmt.Printf("Api version: %s\n", apiVersion) + fmt.Printf("Git commit: %s\n", commitID) fmt.Printf("Go version: %s\n", goVersion) - if commitID != "" { - fmt.Printf("Git commit: %s\n", commitID) - } - if built != "" { - fmt.Printf("Built: %s\n", built) - } fmt.Printf("OS/Arch: %s/%s\n", runtime.GOOS, runtime.GOARCH) + fmt.Printf("Built: %s\n", built) } else { handle() } @@ -113,7 +129,7 @@ func usage() { [-d DESC] [-e EXPIRE] [-s STYLE] [-c {url,md,rst}] file [file ...] -Doc to https://picbed.rtfd.vip/cli.html +Doc to https://sapic.rtfd.vip/cli.html Git to https://github.com/sapicd/cli positional arguments: @@ -123,12 +139,12 @@ optional arguments: -h, --help show this help message and exit -v, --version show cli version and exit -i, --info show full info and exit - -u, --picbed-url PICBED_URL - The picbed upload api url. - Or use environment variable: picbed_cli_apiurl - -t, --picbed-token PICBED_TOKEN - The picbed LinkToken. - Or use environment variable: picbed_cli_apitoken + -u, --sapic-url SAPIC_URL + The sapic upload api url. + Or use environment variable: sapicli_apiurl + -t, --sapic-token SAPI_TOKEN + The sapic LinkToken. + Or use environment variable: sapicli_apitoken -a, --album ALBUM Set image album -d, --desc DESC Set image title(description) -e, --expire EXPIRE Set image expire(seconds) @@ -162,12 +178,19 @@ func handle() { } if url == "" { url = os.Getenv("picbed_cli_apiurl") + if url == "" { + url = os.Getenv("sapicli_apiurl") + } } if token == "" { token = os.Getenv("picbed_cli_apitoken") + if token == "" { + token = os.Getenv("sapicli_apitoken") + + } } if url == "" { - fmt.Printf("No valid picbed api url\n\n") + fmt.Printf("No valid sapic(picbed) api url\n\n") usage() return } @@ -228,17 +251,8 @@ func handle() { for i, res := range result { if res.Code == 0 && res.Src != "" { url := res.Tpl["URL"] - if url == "" { - url = res.Src - } rst := res.Tpl["rST"] - if rst == "" { - rst = fmt.Sprintf(".. image:: %s", url) - } md := res.Tpl["Markdown"] - if md == "" { - md = fmt.Sprintf("![](%s)", url) - } contents[i] = map[string]string{ "name": res.Filename, "url": url, "rst": rst, "md": md, } @@ -256,22 +270,27 @@ func apiUpload(f string, result *[]apiResult, index int) { var post http.Request post.ParseForm() + post.Form.Add("origin", "cli/"+version) + post.Form.Add("_upload_field", "picbed") post.Form.Add("picbed", base64.StdEncoding.EncodeToString(pic)) post.Form.Add("filename", filepath.Base(f)) post.Form.Add("album", album) post.Form.Add("title", desc) - post.Form.Add("expire", string(strconv.Itoa(int(expire)))) - post.Form.Add("origin", "cli/"+version) + if expire > 0 { + post.Form.Add("expire", string(strconv.Itoa(int(expire)))) + } ua := fmt.Sprintf( - "picbed-cli/%s go/%s %s %s", + "sapicli/%s go/%s %s %s", version, goVersion, runtime.GOOS, runtime.GOARCH, ) - client := &http.Client{Timeout: 10 * time.Second} - req, err := http.NewRequest("POST", url, strings.NewReader(post.Form.Encode())) + client := &http.Client{Timeout: 30 * time.Second} + req, err := http.NewRequest( + "POST", url, strings.NewReader(post.Form.Encode()), + ) if err != nil { log.Fatal(err) return