← Back to team overview

gnome-split-team team mailing list archive

  1. gnome-split-team team
  2. Mailing list archive
  3. Message #00158

[Branch ~respawneral/gnome-split/mainline] Rev 267: Add a new configuration value to define the

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 267
committer: Guillaume Mazoyer <respawneral@xxxxxxxxx>
branch nick: gnome-split
timestamp: Fri 2011-10-28 23:57:35 +0200
message:
  Add a new configuration value to define the
  buffer size for I/O operations.
  
  This option is not exposed in the preferences
  dialog because it is not considered as accessible
  for lambda users. Only power users may want to be
  able to change such a value.
modified:
  po/gnome-split.pot
  src/org/gnome/split/config/Configuration.java
  src/org/gnome/split/core/DefaultEngine.java
  src/org/gnome/split/core/merger/DefaultMergeEngine.java
  src/org/gnome/split/core/splitter/DefaultSplitEngine.java


--
lp:gnome-split
https://code.launchpad.net/~respawneral/gnome-split/mainline

Your team GNOME Split developers is subscribed to branch lp:gnome-split.
To unsubscribe from this branch go to https://code.launchpad.net/~respawneral/gnome-split/mainline/+edit-subscription

=== modified file 'po/gnome-split.pot'
--- po/gnome-split.pot	2011-08-14 21:40:20 +0000
+++ po/gnome-split.pot	2011-10-28 21:57:35 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-14 23:38+0200\n"
+"POT-Creation-Date: 2011-10-28 23:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -391,12 +391,12 @@
 msgstr ""
 
 #: src/org/gnome/split/gtk/dialog/PreferencesDialog.java:148
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:110
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:111
 msgid "Assistant"
 msgstr ""
 
 #: src/org/gnome/split/gtk/dialog/PreferencesDialog.java:158
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:264
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:265
 msgid "_Show the assistant on start"
 msgstr ""
 
@@ -587,101 +587,101 @@
 msgid "View:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:220
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:221
 msgid "What do you want to do?"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:232
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:233
 msgid "Split a file"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:233
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:234
 msgid "Merge several files"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:281
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:282
 msgid "Action selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:291
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:292
 msgid ""
 "You can verify that all the data that have been collected are correct. If "
 "they are not, you can go back to a previous step to change them."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:299
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:300
 msgid "Confirmation"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:311
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:312
 msgid "Select the file to split."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:321
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:573
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:322
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:579
 msgid "File to split:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:325
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:512
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:326
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:513
 msgid "Select a file."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:345
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:533
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:346
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:534
 msgid "File selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:357
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:358
 msgid ""
 "Select the maximal size for each chunk. You can let GNOME Split calculate "
 "the size by giving the number of chunks to create."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:399
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:400
 msgid ""
 "Invalid chunk size. The size must be lower than the size of the file to "
 "split."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:429
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:430
 msgid "Size selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:444
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:445
 msgid "The algorithm defines the way how the file will be split."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:454
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:455
 msgid "Algorithm to use:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:479
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:480
 msgid "Algorithm selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:491
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:492
 msgid "Select the first file to merge."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:501
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:502
 msgid "File to merge:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:505
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:506
 #: src/org/gnome/split/gtk/widget/MergeWidget.java:123
 msgid "Valid chunks"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:567
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:573
 msgid "First file to merge:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:574
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:580
 msgid "Maximum size of a chunk:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:575
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:581
 msgid "Algorithm of split:"
 msgstr ""
 

=== modified file 'src/org/gnome/split/config/Configuration.java'
--- src/org/gnome/split/config/Configuration.java	2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/config/Configuration.java	2011-10-28 21:57:35 +0000
@@ -147,6 +147,13 @@
     public byte CLOSE_BEHAVIOR;
 
     /**
+     * The size of the buffer used for read/write operations. This is not
+     * exposed in the preferences dialog because this configuration value is
+     * considered useful only for power users.
+     */
+    public int BUFFER_SIZE;
+
+    /**
      * Private constructor can't instantiate Configuration in other class.<br>
      * Check for preferences file and load it.
      */
@@ -207,6 +214,7 @@
             writer.write("ShowStatusbar     = true\n");
             writer.write("DontAskToQuit     = false\n");
             writer.write("CloseBehavior     = 0\n");
+            writer.write("BufferSize        = " + 1048576 + "\n");
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
@@ -265,6 +273,7 @@
             SHOW_STATUSBAR = Boolean.parseBoolean(preferences.getProperty("ShowStatusbar", "true"));
             DO_NOT_ASK_QUIT = Boolean.parseBoolean(preferences.getProperty("DontAskToQuit", "false"));
             CLOSE_BEHAVIOR = Byte.parseByte(preferences.getProperty("CloseBehavior", "0"));
+            BUFFER_SIZE = Integer.parseInt(preferences.getProperty("BufferSize", "1048576"));
         } catch (IOException e) {
             e.printStackTrace();
             System.exit(1);
@@ -310,6 +319,7 @@
             writer.write("ShowStatusbar     = " + SHOW_STATUSBAR + "\n");
             writer.write("DontAskToQuit     = " + DO_NOT_ASK_QUIT + "\n");
             writer.write("CloseBehavior     = " + CLOSE_BEHAVIOR + "\n");
+            writer.write("BufferSize        = " + BUFFER_SIZE + "\n");
         } catch (IOException e) {
             e.printStackTrace();
         } finally {

=== modified file 'src/org/gnome/split/core/DefaultEngine.java'
--- src/org/gnome/split/core/DefaultEngine.java	2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/DefaultEngine.java	2011-10-28 21:57:35 +0000
@@ -196,6 +196,5 @@
                 fireEngineSpeedChanged(value);
             }
         }
-
     }
 }

=== modified file 'src/org/gnome/split/core/merger/DefaultMergeEngine.java'
--- src/org/gnome/split/core/merger/DefaultMergeEngine.java	2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/merger/DefaultMergeEngine.java	2011-10-28 21:57:35 +0000
@@ -287,6 +287,7 @@
     protected boolean mergeChunk(GRandomAccessFile merge, GRandomAccessFile chunk, long read, long length)
             throws IOException {
         // Setup the buffer
+        int bufferSize = app.getConfig().BUFFER_SIZE;
         byte[] buffer = null;
 
         // Merge the file
@@ -307,7 +308,7 @@
             }
 
             // Define a new buffer size
-            buffer = new byte[(65536 > (length - read) ? (int) (length - read) : 65536)];
+            buffer = new byte[(bufferSize > (length - read) ? (int) (length - read) : bufferSize)];
 
             // Read and write data
             chunk.read(buffer);

=== modified file 'src/org/gnome/split/core/splitter/DefaultSplitEngine.java'
--- src/org/gnome/split/core/splitter/DefaultSplitEngine.java	2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/core/splitter/DefaultSplitEngine.java	2011-10-28 21:57:35 +0000
@@ -224,6 +224,7 @@
      */
     protected boolean writeChunk(GRandomAccessFile split, GRandomAccessFile chunk) throws IOException {
         // Needed variables to know when the chunk writing must be stopped
+        int bufferSize = app.getConfig().BUFFER_SIZE;
         long read = 0;
         byte[] buffer = null;
 
@@ -244,7 +245,7 @@
             }
 
             // Define a new buffer size
-            buffer = new byte[(65536 > (size - read) ? (int) (size - read) : 65536)];
+            buffer = new byte[(bufferSize > (size - read) ? (int) (size - read) : bufferSize)];
 
             // Read and write data
             split.read(buffer);
  Thread Previous • Date Previous • • Thread Next