Fix encoding bug in search engine on Windows

Attempt to address issue #29.

AUTHORS

@@ -92,6 +92,7 @@ Translations authors:
   - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
+  - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
   - Italian: Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)

Changelog

@@ -1,3 +1,25 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v3.0.3
+    - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68)
+    - BUGFIX: "Completed On" column is not updated until restart (closes #84)
+    - BUGFIX: Fix possible build error on some systems
+    - I18N: Add hebrew translation
+
+* Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2
+    - FEATURE: Add "clear" functionality to search field (closes #59)
+    - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49)
+    - BUGFIX: Fix crash when a fastresume file is empty (closes #52)
+    - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53)
+    - BUGFIX: Improve performance when showing torrent content panel (Improves #24)
+    - BUGFIX: Fix label-based filtering of torrents whose label contains special characters
+    - BUGFIX: Fix possible crash due to labels (closes #64)
+
+* Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1
+    - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254)
+    - BUGFIX: Remember queue position for torrents without metadata (closes #17)
+    - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19)
+    - BUGFIX: Fix search plugins updating (closes #25)
+    - BUGFIX: Make uTP connections rate limited by default
+
 * Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
     - FEATURE: Brand new torrent addition dialog
     - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)

README.os2

@@ -42,7 +42,10 @@ LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
 
 Of course all the above path references have to be adjusted to your build env.
 
-It should now be easy to build qBittorrent:
+Now you can either do a normal build or a shadow build. A shadow build has the
+advantage that no created files are in the same dir as the sources are.
+
+For a normal build do the following:
 
 Simply type:
 $ qmake
@@ -50,6 +53,16 @@ $ qmake
 Followed by:
 $ make
 
+For a shadow build do the following:
+given your sources are in x:\trees\qbittorrent\trunk create a 
+x:\trees\qbittorrent\build directory
+
+Now switch to the created directory and type:
+$ qmake ..\trunk
+
+Followed by:
+$ make
+
 If all works fine you should get a working qbittorrent executable.
 
 If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:

install.os2

@@ -67,7 +67,7 @@ ZIP Installation:
 klibc
 -----
 
-  1. Download klibc 0.6.4 or better (see http://svn.netlabs.org/libc for more information)
+  1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information)
   2. Install the files to your libpath eg x:\ecs\dll
 
 openssl 1.0
@@ -146,6 +146,14 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
+2012-09-06
+
+  * updated to 3.0.2 code level of QBittorrent
+
+2012-05-14
+
+  * updated to 2.9.8 code level of QBittorrent
+
 2012-03-15
 
   * updated to 2.9.5 code level of QBittorrent

src/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>

src/about_imp.h

@@ -80,6 +80,7 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Georgian:</u> Beqa Arabuli (arabulibeqa@yahoo.com)</li>\
           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\
           <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</li>\
+          <li><u>Hebrew:</u> David Deutsch (d.deffo@gmail.com)</li>\
           <li><u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\
           <li><u>Italian:</u> Matteo Sechi (bu17714@gmail.com)</li>\
           <li><u>Japanese:</u> Masato Hashimoto (cabezon.hashimoto@gmail.com)</li>\

src/fs_utils.cpp

@@ -66,9 +66,6 @@
 
 using namespace libtorrent;
 
-// EXT2/3/4 file systems support a maximum of 255 bytes for filenames.
-const int MAX_FILENAME_BYTES = 255;
-
 /**
  * Converts a path to a string suitable for display.
  * This function makes sure the directory separator used is consistent
@@ -204,54 +201,6 @@ qint64 fsutils::computePathSize(const QString& path)
   return size;
 }
 
-/**
- * Fixes the given file path by shortening the file names if too long.
- */
-QString fsutils::fixFileNames(const QString& path)
-{
-  QByteArray raw_path = path.toLocal8Bit();
-  raw_path.replace("\\", "/");
-  QList<QByteArray> parts = raw_path.split('/');
-  if (parts.isEmpty()) return path;
-  QByteArray last_part = parts.takeLast();
-  
-  QList<QByteArray>::iterator it = parts.begin();
-  QList<QByteArray>::iterator itend = parts.end();
-  for ( ; it != itend; ++it) {
-    // Make sure the filename is not too long
-    if (it->size() > MAX_FILENAME_BYTES) {
-      qWarning() << "Folder" << *it << "was cut because it was too long";
-      it->resize(MAX_FILENAME_BYTES);
-      qWarning() << "New folder name is" << *it;
-      Q_ASSERT(it->length() == MAX_FILENAME_BYTES);
-    }
-  }
-  // Fix the last part (file name)
-  qDebug() << "Last part length:" << last_part.length();
-  if (last_part.length() > MAX_FILENAME_BYTES) {
-    qWarning() << "Filename" << last_part << "was cut because it was too long";
-    // Shorten the name, keep the file extension
-    const int point_index = last_part.lastIndexOf(".");
-    QByteArray extension = "";
-    if (point_index >= 0) {
-      extension = last_part.mid(point_index);
-      last_part = last_part.left(point_index);
-    }
-    last_part.resize(MAX_FILENAME_BYTES - extension.length());
-    last_part += extension;
-    Q_ASSERT(last_part.length() == MAX_FILENAME_BYTES);
-    qWarning() << "New file name is" << last_part;
-  }
-
-  QString ret;
-  foreach(const QByteArray& part, parts) {
-    ret += QString::fromLocal8Bit(part.constData()) + "/";
-  }
-  ret += QString::fromLocal8Bit(last_part.constData());
-
-  return ret;
-}
-
 /**
  * Makes deep comparison of two files to make sure they are identical.
  */
@@ -452,7 +401,7 @@ QString fsutils::QDesktopServicesDataLocation() {
 }
 
 QString fsutils::QDesktopServicesCacheLocation() {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
   return QDesktopServicesDataLocation() + QLatin1String("\\cache");
 #else
 #ifdef Q_WS_MAC
@@ -496,6 +445,9 @@ QString fsutils::QDesktopServicesDownloadLocation() {
   QString user_dirs_file = config_path + "/user-dirs.dirs";
   if (QFile::exists(user_dirs_file)) {
     QSettings settings(user_dirs_file, QSettings::IniFormat);
+    // We need to force UTF-8 encoding here since this is not
+    // the default for Ini files.
+    settings.setIniCodec("UTF-8");
     QString xdg_download_dir = settings.value("XDG_DOWNLOAD_DIR").toString();
     if (!xdg_download_dir.isEmpty()) {
       // Resolve $HOME environment variables

src/fs_utils.h

@@ -46,7 +46,6 @@ static QString toDisplayPath(const QString& path);
 static QString fileExtension(const QString& filename);
 static QString fileName(const QString& file_path);
 static qint64 computePathSize(const QString& path);
-static QString fixFileNames(const QString& path);
 static bool sameFiles(const QString& path1, const QString& path2);
 static QString updateLabelInSavePath(QString defaultSavePath, QString save_path, const QString& old_label, const QString& new_label);
 static QString toValidFileSystemName(QString filename);

src/lang.qrc

@@ -36,5 +36,6 @@
   <file>lang/qbittorrent_ka.qm</file>
   <file>lang/qbittorrent_be.qm</file>
   <file>lang/qbittorrent_eu.qm</file>
+  <file>lang/qbittorrent_he.qm</file>
 </qresource>
 </RCC>