Commit: 3c5ff3d4a8cb37b9eb529d0b709413e0bdde95a0 - remicatbox (hg)

Crystal library and CLI tool for Catbox.moe

Commit MetaInfo

• Revision: 3c5ff3d4a8cb37b9eb529d0b709413e0bdde95a0 (tree)
• Time: 2023-03-30 23:53:39
• Author: Remilia Scarlet <remilia@post...>
• Commiter: Remilia Scarlet

Log Message

Update to a newer libremiliacr version. Update copyright headers.

Change Summary

• modified: shard.lock
• modified: shard.yml
• modified: src/remicatbox.cr
• modified: tools/catboxtool.cr

Incremental Difference

diff -r 9124e4d13bd9 -r 3c5ff3d4a8cb shard.lock
--- a/shard.lock	Mon Nov 08 02:17:33 2021 -0700
+++ b/shard.lock	Thu Mar 30 08:53:39 2023 -0600
@@ -1,6 +1,6 @@
 version: 2.0
 shards:
   libremiliacr:
-    git: https://gitlab.com/remiliascarlet/libremiliacr.git
-    version: 0.4.7
+    fossil: https://chiselapp.com/user/MistressRemilia/repository/libremiliacr
+    version: 0.9.0
 

diff -r 9124e4d13bd9 -r 3c5ff3d4a8cb shard.yml
--- a/shard.yml	Mon Nov 08 02:17:33 2021 -0700
+++ b/shard.yml	Thu Mar 30 08:53:39 2023 -0600
@@ -12,5 +12,5 @@
 
 dependencies:
   libremiliacr:
-    gitlab: RemiliaScarlet/libremiliacr
-    version: ~> 0.4.7
+    fossil: https://chiselapp.com/user/MistressRemilia/repository/libremiliacr
+    version: ~> 0.9.0

diff -r 9124e4d13bd9 -r 3c5ff3d4a8cb src/remicatbox.cr
--- a/src/remicatbox.cr	Mon Nov 08 02:17:33 2021 -0700
+++ b/src/remicatbox.cr	Thu Mar 30 08:53:39 2023 -0600
@@ -1,5 +1,5 @@
 #### RemiCatbox - A library to interact with Catbox.
-#### Copyright (C) 2021 Remilia Scarlet
+#### Copyright (C) 2021-2023 Remilia Scarlet
 ####
 #### This program is free software: you can redistribute it and/or modify it
 #### under the terms of the GNU Affero General Public License as published by

diff -r 9124e4d13bd9 -r 3c5ff3d4a8cb tools/catboxtool.cr
--- a/tools/catboxtool.cr	Mon Nov 08 02:17:33 2021 -0700
+++ b/tools/catboxtool.cr	Thu Mar 30 08:53:39 2023 -0600
@@ -1,5 +1,5 @@
 #### CatboxTool - A CLI tool to interact with Catbox.
-#### Copyright (C) 2021 Remilia Scarlet
+#### Copyright (C) 2021-2023 Remilia Scarlet
 ####
 #### This program is free software: you can redistribute it and/or modify it
 #### under the terms of the GNU Affero General Public License as published by
@@ -14,8 +14,7 @@
 #### You should have received a copy of the GNU Affero General Public License
 #### along with this program.  If not, see <https://www.gnu.org/licenses/>.
 require "../src/remicatbox"
-require "libremiliacr/remiargparser"
-require "libremiliacr/remilog"
+require "libremiliacr"
 require "json"
 
 module CatboxTool
@@ -35,7 +34,7 @@
   end
 
   class Program
-    getter args = RemiArgParser::ArgParser.new("catboxtool", VERSION)
+    getter args = RemiLib::Args::ArgParser.new("catboxtool", VERSION)
     @userHash : String? = nil
     @files = [] of String
 
@@ -47,9 +46,9 @@
       # Load config and get a user hash
       config = loadConfig
       @userHash = config.userHash
-      if args["user-hash"].called
+      if args["user-hash"].called?
         @userHash = args["user-hash"].str
-      elsif args["no-user-hash"].called
+      elsif args["no-user-hash"].called?
         @userHash = nil
       end
 
@@ -57,23 +56,23 @@
 
       # We'll need a user hash for certain operations
       unless @userHash
-        if args["album-edit"].called || args["album-delete"].called
-          RemiLog.log.fatal("A user hash is required to edit or delete albums")
+        if args["album-edit"].called? || args["album-delete"].called?
+          RemiLib.log.fatal("A user hash is required to edit or delete albums")
         end
       end
 
       # Do one of the possible operations.
-      if args["album"].called
+      if args["album"].called?
         case
-        when args["album-delete"].called then deleteAlbum
-        when args["album-edit"].called then editAlbum
-        when args["album-add"].called then albumAdd
-        when args["album-remove"].called then albumRemove
+        when args["album-delete"].called? then deleteAlbum
+        when args["album-edit"].called? then editAlbum
+        when args["album-add"].called? then albumAdd
+        when args["album-remove"].called? then albumRemove
         end
       else
         case
-        when args["delete"].called then deleteFiles
-        when args["album-title"].called then uploadToAlbum
+        when args["delete"].called? then deleteFiles
+        when args["album-title"].called? then uploadToAlbum
         else uploadStuff
         end
       end
@@ -90,7 +89,7 @@
           if File.exists?(file)
             puts "Uploading #{Path[file].basename}..."
           else
-            RemiLog.log.error("File not found: #{file}")
+            RemiLib.log.error("File not found: #{file}")
             next
           end
         end
@@ -100,7 +99,7 @@
         if code == 200
           uploaded << result
         else
-          RemiLog.log.error("Could not upload #{file}: #{result}")
+          RemiLib.log.error("Could not upload #{file}: #{result}")
         end
       end
 
@@ -115,7 +114,7 @@
 
     # Uploads things into a new album
     private def uploadToAlbum
-      albumDesc = args["album-desc"].called ? args["album-desc"].str : nil
+      albumDesc = args["album-desc"].called? ? args["album-desc"].str : nil
 
       puts "Uploading things to new album..."
       begin
@@ -123,7 +122,7 @@
 
         # Print any URLs that were generated during the initial file upload
         if newUrls.empty?
-          RemiLog.log.fatal("No files could be uploaded")
+          RemiLib.log.fatal("No files could be uploaded")
         else
           puts "URLs: "
           newUrls.each { |url| puts "  #{url}" }
@@ -133,10 +132,10 @@
         if code == 200
           puts "Album: #{result}"
         else
-          RemiLog.log.error("Could not create an album from the uploads: #{result}")
+          RemiLib.log.error("Could not create an album from the uploads: #{result}")
         end
       rescue err : Exception
-        RemiLog.log.error("#{err}")
+        RemiLib.log.error("#{err}")
       end
     end
 
@@ -148,7 +147,7 @@
       if code == 200
         puts "Success"
       else
-        RemiLog.log.fatal("Could not delete album: #{result}")
+        RemiLib.log.fatal("Could not delete album: #{result}")
       end
     end
 
@@ -162,46 +161,46 @@
       if code == 200
         puts "Success: #{result}"
       else
-        RemiLog.log.fatal("Could not edit album: #{result}")
+        RemiLib.log.fatal("Could not edit album: #{result}")
       end
     end
 
     # Adds files already uploaded to Catbox to an existing album
     private def albumAdd
-      RemiLog.log.fatal("No files specified to add to an album") if @files.empty?
+      RemiLib.log.fatal("No files specified to add to an album") if @files.empty?
       puts "Adding #{@files.size} file#{@files.size == 1 ? "" : "s"} to album #{args["album"].str}..."
       result, code = RemiCatbox.addToAlbum(args["album"].str, @userHash.not_nil!, @files)
 
       if code == 200
         puts "Success: #{result}"
       else
-        RemiLog.log.fatal("Could not add files to album: #{result}")
+        RemiLib.log.fatal("Could not add files to album: #{result}")
       end
     end
 
     # Removes files from an album
     private def albumRemove
-      RemiLog.log.fatal("No files specified to remove from an album") if @files.empty?
+      RemiLib.log.fatal("No files specified to remove from an album") if @files.empty?
       puts "Removing #{@files.size} file#{@files.size == 1 ? "" : "s"} from album #{args["album"].str}..."
       result, code = RemiCatbox.removeFromAlbum(args["album"].str, @userHash.not_nil!, @files)
 
       if code == 200
         puts "Success: #{result}"
       else
-        RemiLog.log.fatal("Could not remove files from album: #{result}")
+        RemiLib.log.fatal("Could not remove files from album: #{result}")
       end
     end
 
     # Deletes files from Catbox
     private def deleteFiles
       puts "Deleting #{@files.size} file#{@files.size == 1 ? "" : "s"}..."
-      RemiLog.log.fatal("No files specified for deletion") if @files.empty?
+      RemiLib.log.fatal("No files specified for deletion") if @files.empty?
       result, code = RemiCatbox.deleteFiles(@userHash.not_nil!, @files)
 
       if code == 200
         puts "Success: #{result}"
       else
-        RemiLog.log.fatal("Could not delete files: #{result}")
+        RemiLib.log.fatal("Could not delete files: #{result}")
       end
     end
 
@@ -230,16 +229,16 @@
       # Add the arguments
       args.addFlag("delete", 'D', help: "Deletes files instead of uploading them.  A userhash is required.")
 
-      args.addString("user-hash", 'u', "Users", "Use a userhash for the upload")
-      args.addFlag("no-user-hash", 'A', "Users", "Do not use the userhash in the config file if it exists")
+      args.addString("user-hash", 'u', group: "Users", help: "Use a userhash for the upload")
+      args.addFlag("no-user-hash", 'A', group: "Users", help: "Do not use the userhash in the config file if it exists")
 
-      args.addString("album", 'a', "Albums", "Manage an existing album with the given short code")
-      args.addString("album-title", 't', "Albums", "Sets an album's title")
-      args.addString("album-desc", 'd', "Albums", "Sets an album's description")
-      args.addFlag("album-add", nil, "Albums", "Adds the files to the album referenced with --album")
-      args.addFlag("album-remove", nil, "Albums", "Removes the files from the album referenced with --album")
-      args.addFlag("album-delete", nil, "Albums", "Deletes the album referenced with --album")
-      args.addFlag("album-edit", nil, "Albums", "Modifies the album referenced with --album")
+      args.addString("album", 'a', group: "Albums", help: "Manage an existing album with the given short code")
+      args.addString("album-title", 't', group: "Albums", help: "Sets an album's title")
+      args.addString("album-desc", 'd', group: "Albums", help: "Sets an album's description")
+      args.addFlag("album-add", nil, group: "Albums", help: "Adds the files to the album referenced with --album")
+      args.addFlag("album-remove", nil, group: "Albums", help: "Removes the files from the album referenced with --album")
+      args.addFlag("album-delete", nil, group: "Albums", help: "Deletes the album referenced with --album")
+      args.addFlag("album-edit", nil, group: "Albums", help: "Modifies the album referenced with --album")
 
       args.postHelpText = %{
 If a user hash is specified in the configuration file, then it is used for all
@@ -254,38 +253,38 @@
       # Parse command line
       begin
         args.parse
-      rescue err : RemiArgParser::ArgumentError
-        RemiLog.log.fatal("#{err}")
+      rescue err : RemiLib::Args::ArgumentError
+        RemiLib.log.fatal("#{err}")
       end
 
       # Check argument combinations and other conditions
-      if args.positionalArgs.empty? && !(args["album-delete"].called || args["album-edit"].called)
-        RemiLog.log.fatal("Nothing to upload or manage")
+      if args.positionalArgs.empty? && !(args["album-delete"].called? || args["album-edit"].called?)
+        RemiLib.log.fatal("Nothing to upload or manage")
       end
 
-      if args["no-user-hash"].called
-        RemiLog.log.fatal("Cannot use --user-hash and --no-user-hash together") if args["user-hash"].called
-        RemiLog.log.fatal("Cannot use --delete and --no-user-hash together") if args["delete"].called
-        RemiLog.log.fatal("Cannot use --album-edit and --no-user-hash together") if args["album-edit"].called
-        RemiLog.log.fatal("Cannot use --album-delete and --no-user-hash together") if args["album-delete"].called
+      if args["no-user-hash"].called?
+        RemiLib.log.fatal("Cannot use --user-hash and --no-user-hash together") if args["user-hash"].called?
+        RemiLib.log.fatal("Cannot use --delete and --no-user-hash together") if args["delete"].called?
+        RemiLib.log.fatal("Cannot use --album-edit and --no-user-hash together") if args["album-edit"].called?
+        RemiLib.log.fatal("Cannot use --album-delete and --no-user-hash together") if args["album-delete"].called?
       end
 
-      unless args["album"].called
-        RemiLog.log.fatal("--album-edit requires an album short code") if args["album-edit"].called
-        RemiLog.log.fatal("--album-delete requires an album short code") if args["album-delete"].called
-        RemiLog.log.fatal("--album-add requires an album short code") if args["album-add"].called
-        RemiLog.log.fatal("--album-remove requires an album short code") if args["album-remove"].called
+      unless args["album"].called?
+        RemiLib.log.fatal("--album-edit requires an album short code") if args["album-edit"].called?
+        RemiLib.log.fatal("--album-delete requires an album short code") if args["album-delete"].called?
+        RemiLib.log.fatal("--album-add requires an album short code") if args["album-add"].called?
+        RemiLib.log.fatal("--album-remove requires an album short code") if args["album-remove"].called?
       end
 
-      if args["album-desc"].called
-        unless (args["album"].called && args["album-edit"].called) || args["album-title"].called
-          RemiLog.log.fatal("--album-desc can only be used when creating or editing an album")
+      if args["album-desc"].called?
+        unless (args["album"].called? && args["album-edit"].called?) || args["album-title"].called?
+          RemiLib.log.fatal("--album-desc can only be used when creating or editing an album")
         end
       end
 
-      if args["delete"].called
-        RemiLog.log.fatal("Cannot use --delete with --album") if args["album"].called
-        RemiLog.log.fatal("Cannot use --delete with --album-title") if args["album-title"].called
+      if args["delete"].called?
+        RemiLib.log.fatal("Cannot use --delete with --album") if args["album"].called?
+        RemiLib.log.fatal("Cannot use --delete with --album-title") if args["album-title"].called?
       end
     end