qiita_org 0.1.31 → 0.1.37

data/lib/qiita_org/get_multiple_files.rb

@@ -1,8 +1,6 @@
 require "colorize"
-#require "../qiita_org/qiita_org.rb"
 require "qiita_org/post.rb"
 require "qiita_org/upload.rb"
-require "qiita_org/decide_option.rb"
 
 class GetMultipleFiles
   def initialize(files, os, type)
@@ -17,9 +15,9 @@ class GetMultipleFiles
   end
 
   def run()
-    puts "post files: #{@files}".green
+    puts "#{@type} files: #{@files}".green
     @files.each do |file|
-      mode = @option || DecideOption.new(file).decide_option()
+      mode = @option || QiitaBase.new().pick_up_option(file)
       puts "qiita #{@type} #{file} #{mode}".green
       if @type == "post"
         qiita = QiitaPost.new(file, mode, @os)

data/lib/qiita_org/get_template.rb

@@ -1,16 +1,13 @@
 require "fileutils"
 require "colorize"
 require "kconv"
-require "qiita_org/search_conf_path"
 require "qiita_org/error_message.rb"
 
 class QiitaGetTemplate
   def initialize(os, filename)
     @os = os
     @filename = filename
-    search = SearchConfPath.new(Dir.pwd, Dir.home)
-    @conf_dir = search.search_conf_path()
-    # check_write_header()
+    @conf_dir = QiitaBase.new().search_conf_path(Dir.pwd, Dir.home)
   end
 
   def get_macos_version()
@@ -105,33 +102,6 @@ class QiitaGetTemplate
     end
   end
 
-  def check_write_header()
-    ["name", "email"].each do |src|
-      print "Write your #{src}?(y/n) "
-      ans = STDIN.gets.chomp
-      next if ans == "n"
-      if ans == "y"
-        send("get_#{src}")
-      end
-    end
-  end
-
-  def get_name()
-    conts = File.readlines(@filename)
-    p "Type your name"
-    name = STDIN.gets
-    conts[3] = "#+AUTHOR: #{name}"
-    File.write(@filename, conts.join)
-  end
-
-  def get_email()
-    conts = File.readlines(@filename)
-    p "Type your email"
-    email = STDIN.gets
-    conts[4] = "#+EMAIL:     (concat \"#{email.chomp}\")\n"
-    File.write(@filename, conts.join)
-  end
-
   def set_name_and_email()
     conf_path = File.join(@conf_dir, ".qiita.conf")
     conf = JSON.load(File.read(conf_path))

data/lib/qiita_org/list.rb

@@ -2,54 +2,23 @@ require "net/https"
 require "json"
 require "open-uri"
 require "colorize"
-require "qiita_org/select_path.rb"
-require "qiita_org/set_config.rb"
 require "qiita_org/error_message.rb"
 require "qiita_org/access_qiita.rb"
 
 class QiitaList
   def initialize(mode)
     @mode = mode
-    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    @base = QiitaBase.new
+    @access_token, @teams_url, @display, @ox_qmd_load_path = @base.set_config()
     if @mode == "teams"
       ErrorMessage.new().teams_url_error(@teams_url)
     end
 
-    @qiita, @path = SelectPath.new().select_path(@mode, @teams_url)
+    @qiita, @path = @base.select_access_path(@mode, @teams_url)
     @items = AccessQiita.new(@access_token, @qiita, @path).access_qiita()
     view_list()
   end
 
-  # select path
-=begin
-  def select_path()
-    case @mode
-    when "teams"
-      @qiita = @teams_url
-      @path = "api/v2/items?page=1&per_page=100"
-    else
-      @qiita = "https://qiita.com/"
-      @path = "api/v2/authenticated_user/items?page=1&per_page=100"
-    end
-  end
-=end
-
-  # access qiita
-=begin
-  def access_qiita()
-    uri = URI.parse(@qiita + @path)
-
-    headers = { "Authorization" => "Bearer # {@access_token}",
-      "Content-Type" => "application/json" }
-
-    response = URI.open(
-                        "# {uri}",
-                        "Authorization" => "# {headers["Authorization"]}",
-                        )
-    @items = JSON.parse(response.read)
-  end
-=end
-
   def view_list()
     @items.each do |item|
       puts "title: #{item["title"]}"
@@ -62,6 +31,5 @@ class QiitaList
       end
       puts ""
     end
-#    p @items[0]["user"]["id"]
   end
 end

data/lib/qiita_org/md_converter_for_image.rb

@@ -1,6 +1,6 @@
 class MdConverter
   def initialize()
-    # @lines = lines
+
   end
 
   def convert_for_image(lines)

data/lib/qiita_org/post.rb

@@ -5,15 +5,15 @@ require "json"
 require "command_line/global"
 require "colorize"
 require "qiita_org/md_converter_for_image"
-require "qiita_org/set_config.rb"
 require "qiita_org/error_message"
-require "qiita_org/file_open.rb"
+require "qiita_org/access_qiita.rb"
 
 class QiitaPost
   def initialize(file, option, os)
     @src = file
     @option = (option == "qiita" || option == "open")? "public" : option
     @os = os
+    @base = QiitaBase.new
   end
 
   public
@@ -21,10 +21,6 @@ class QiitaPost
     m = conts.match(/\#\+(TITLE|title|Title): (.+)/)
     @title = m ?  m[2] : "テスト"
     @tags = if m = conts.match(/\#\+(TAG|tag|Tag|tags|TAGS|Tags): (.+)/)
-              #if m[2].count(",") >= 5
-               # puts "The maximum number of tag is five. Please delete some tags.".red
-                #exit
-              #end
               ErrorMessage.new().many_tags_error(m[2])
               m[2].split(",").inject([]) do |l, c|
                  l << { name: c.strip } #, versions: []}
@@ -40,7 +36,6 @@ class QiitaPost
   def convert_org_to_md()
     command = "emacs #{@src} --batch -l #{@ox_qmd_load_path} -f org-qmd-export-to-markdown --kill"
     res = command_line command
-    #p res
     ErrorMessage.new().md_file_exists?(@src, res)
   end
 
@@ -52,16 +47,38 @@ class QiitaPost
   end
 
   # patch or post selector by qiita_id
-  def select_patch_or_post(conts, option)
-    m = []
+  def select_patch_or_post(src, option)
+    #m = []
     patch = false
-    if m = conts.match(/\#\+qiita_#{option}: (.+)/)
-      qiita_id = m[1]
-      patch = true
+    qiita_id = @base.get_report_id(src, option)
+    patch = true if qiita_id != nil
+    #if m = conts.match(/\#\+qiita_#{option}: (.+)/)
+     # qiita_id = m[1]
+      #patch = true
+    #else
+     # qiita_id = ""
+    #end
+    return qiita_id, patch
+  end
+
+  def check_change_public(conts, option, id)
+    qiita = "https://qiita.com/"
+    path = "api/v2/items/#{id}"
+    items = AccessQiita.new(@access_token, qiita, path).access_qiita()
+
+    if items["private"]
+      return conts, option
     else
-      qiita_id = ""
+      option = "public"
+      lines = File.readlines(@src)
+      file = File.open(@src, "w")
+      lines.each_with_index do |line, i|
+        lines[i] = "#+qiita_#{option}: #{id}\n" if line.match(/\#\+qiita_private: (.+)/)
+        file.print(lines[i])
+      end
+      conts = File.read(@src)
+      return conts, option
     end
-    return qiita_id, patch
   end
 
   # check twitter post
@@ -71,8 +88,6 @@ class QiitaPost
 
   def select_option(option)
     qiita = (option == "teams")? @teams_url : "https://qiita.com/"
-    #qiita = (option == "teams")? "https://nishitani.qiita.com/" :
-     # "https://qiita.com/"
     case option
     when "teams", "qiita", "public", "open"
       private = false
@@ -146,24 +161,10 @@ class QiitaPost
     end
   end
 
-  # open qiita
-=begin
-  def open_qiita()
-    if @os == "mac"
-      system "open # {@res_body["url"]}"
-    elsif @os == "windows"
-      system "explorer.exe # {@res_body["url"]}"
-    else
-      system "open # {@res_body["url"]}"
-      system "xdg-open # {@res_body["url"]}"
-    end
-  end
-=end
-
   def run()
     @conts = File.read(@src)
     @title, @tags = get_title_tags(@conts)
-    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
+    @access_token, @teams_url, @display, @ox_qmd_load_path = @base.set_config()
 
     if @option == "teams"
       ErrorMessage.new().teams_url_error(@teams_url)
@@ -172,14 +173,14 @@ class QiitaPost
     convert_org_to_md()
     add_source_path_in_md()
     @lines = MdConverter.new().convert_for_image(@lines)
-    @qiita_id, @patch = select_patch_or_post(@conts, @option)
+    @qiita_id, @patch = select_patch_or_post(@src, @option)
+    @conts, @option = check_change_public(@conts, @option, @qiita_id) if (@patch and @option == "private")
     @twitter = select_twitter(@conts, @option)
     @qiita, @private = select_option(@option)
     @res = qiita_post()
     get_and_print_qiita_return()
 
-    #open_qiita()
-    FileOpen.new(@os).file_open(@res_body["url"]) if @display != "suppress"
+    @base.file_open(@os, @res_body["url"]) if @display != "suppress"
 
     add_qiita_id_on_org()
 

data/lib/qiita_org/template.org

@@ -6,7 +6,7 @@
 #+LANGUAGE:  jp
 # +OPTIONS:   H:4 toc:t num:2
 #+OPTIONS:   toc:nil
-#+TAG: tag1, tag2
+#+TAG: hoge, 
 #+TWITTER: off
 # +SETUPFILE: ~/.emacs.d/org-mode/theme-readtheorg.setup
 

data/lib/qiita_org/upload.rb

@@ -1,9 +1,5 @@
 require "colorize"
 require "io/console"
-require "qiita_org/get_file_path.rb"
-require "qiita_org/show_file_and_url.rb"
-require "qiita_org/file_open.rb"
-require "qiita_org/set_config.rb"
 require "qiita_org/access_qiita.rb"
 
 class QiitaFileUpLoad
@@ -11,30 +7,21 @@ class QiitaFileUpLoad
     @src = src
     @option = (option == "qiita" || option == "open")? "public" : option
     @os = os
-    @fileopen = FileOpen.new(@os)
-    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
-    if @option == "teams"
-      ErrorMessage.new().teams_url_error(@teams_url)
-    end
+    @base = QiitaBase.new()
+    @access_token, @teams_url, @display, @ox_qmd_load_path = QiitaBase.new().set_config()
+    ErrorMessage.new().teams_url_error(@teams_url) if @option == "teams"
   end
 
   def upload()
-    #paths = GetFilePath.new(@src).get_file_path()
     paths = get_file_path(@src)
     unless paths.empty?
-      #showfile = ShowFile.new(paths, @src, @option, @os)
-      #showfile.open_file_dir()
       open_file_dir(paths)
-      #showfile.open_qiita()
       open_qiita()
 
       puts "Overwrite file URL's on #{@src}? (y/n)".green
       ans = STDIN.getch
 
-      if ans == "y"
-        #showfile.input_url_to_org()
-        input_url_to_org(paths)
-      end
+      input_url_to_org(paths) if ans == "y"
     else
       puts "file path is empty.".red
     end
@@ -59,27 +46,19 @@ class QiitaFileUpLoad
   def open_file_dir(paths)
     previous_paths = []
     previous_paths << File.join(paths[0].split("/")[0..-2])
-    @fileopen.file_open(File.join(paths[0].split("/")[0..-2]))
+    @base.file_open(@os, File.join(paths[0].split("/")[0..-2]))
 
     paths.each do |path|
       dir_path = File.join(path.split("/")[0..-2])
       unless previous_paths.include?(dir_path)
         previous_paths << dir_path
-        @fileopen.file_open(dir_path)
+        @base.file_open(@os, dir_path)
       end
     end
   end
 
   def open_qiita()
-    conts = File.read(@src)
-    id = conts.match(/\#\+qiita_#{@option}: (.+)/)[1]
-
-=begin
-    @access_token, @teams_url, @display, @ox_qmd_load_path = SetConfig.new().set_config()
-    if @option == "teams"
-      ErrorMassage.new().teams_url_error(@teams_url)
-    end
-=end
+    id = QiitaBase.new().get_report_id(@src, @option)
 
     qiita = (@option == "teams") ? @teams_url : "https://qiita.com/"
     path = "api/v2/items/#{id}"
@@ -87,7 +66,7 @@ class QiitaFileUpLoad
     @access = AccessQiita.new(@access_token, qiita, path)
     items = @access.access_qiita()
 
-    @fileopen.file_open(items["url"])
+    @base.file_open(@os, items["url"])
   end
 
   def input_url_to_org(paths)
@@ -97,7 +76,12 @@ class QiitaFileUpLoad
 
     paths.each do |path|
       file_name = File.basename(path).strip
-      url = get_file_url(id, file_name)
+      #url = (get_file_url(id, file_name)) ? @file_url : next
+      if get_file_url(id, file_name)
+        url = @file_url
+      else
+        next
+      end
       lines.each_with_index do |line, i|
         if line.match(/\[\[file:#{path}\]\]/)
           lines[i] = "[[#{url}][file:#{path}]]\n"
@@ -114,7 +98,13 @@ class QiitaFileUpLoad
 
     items = @access.access_qiita()
 
-    file_url = items["body"].match(/\!\[#{file_name}\]\(((.+))\)/)[2]
-    return file_url
+    if items["body"].match?(/\!\[#{file_name}\]\(((.+))\)/)
+      @file_url = items["body"].match(/\!\[#{file_name}\]\(((.+))\)/)[2]
+      puts "Wrote #{file_name}'s URL".green
+      return true
+    else
+      puts "Can not find #{file_name}'s URL".red
+      return false
+    end
   end
 end

data/lib/qiita_org/version.rb

@@ -1,3 +1,3 @@
 module QiitaOrg
-  VERSION = "0.1.31"
+  VERSION = "0.1.37"
 end

data/tests/test.org

@@ -1,4 +1,5 @@
-#+qiita_private: e87e38157a72b4c2e839
+#+qiita_private: 4a238f55b2014ae6494e
+# +qiita_private: e87e38157a72b4c2e839
 # +qiita_private: 5f8c73e8007e52ef3f40
 # +qiita_private: 4decbf7a81ef2327643f
 #+OPTIONS: ^:{}

data/tests/test2.org

@@ -1,4 +1,3 @@
-#+qiita_teams: 7e95d62ebdbedd022256
 #+qiita_private: 6ce39fa8ae7f7a472cf2
 #+OPTIONS: ^:{}
 #+STARTUP: indent nolineimages
@@ -19,6 +18,6 @@ fogefoge
 #+ATTR_LATEX: :width 8cm
 [[https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/ebf505d2-6960-6bb9-20f0-e16dab142f4a.png][file:../figs/fig1.png]]
 
-[[https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/612049/ebf505d2-6960-6bb9-20f0-e16dab142f4a.png][file:../figs/fig1.png]]
+[[file:../figs/fig2.png]]